diff options
290 files changed, 892 insertions, 864 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java index 6514bb98fa3..1f475c1a21d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ImageManagerTest.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCacheQuery; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.KeyedImage; import org.eclipse.osee.support.test.util.TestUtil; @@ -157,7 +157,7 @@ public abstract class ImageManagerTest { } public static ByteArrayInputStream getByteArrayInputStream(String imageFilename) throws Exception { - File imageFile = SkynetGuiPlugin.getInstance().getPluginFile("images/" + imageFilename); + File imageFile = Activator.getInstance().getPluginFile("images/" + imageFilename); if (!imageFile.exists()) { throw new OseeArgumentException("Invalid image filename."); } @@ -175,12 +175,12 @@ public abstract class ImageManagerTest { @Override public ImageDescriptor createImageDescriptor() { - return ImageManager.createImageDescriptor(SkynetGuiPlugin.PLUGIN_ID, "images", fileName); + return ImageManager.createImageDescriptor(Activator.PLUGIN_ID, "images", fileName); } @Override public String getImageKey() { - return SkynetGuiPlugin.PLUGIN_ID + "." + fileName; + return Activator.PLUGIN_ID + "." + fileName; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index 4cf1b019565..8fcd1f34bad 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Gui Plug-in (Incubation) Bundle-SymbolicName: org.eclipse.osee.framework.ui.skynet;singleton:=true Bundle-Version: 0.9.9.qualifier Eclipse-ExtensibleAPI: true -Bundle-Activator: org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin +Bundle-Activator: org.eclipse.osee.framework.ui.skynet.internal.Activator Service-Component: OSGI-INF/*.xml Require-Bundle: javax.mail.glassfish, org.eclipse.birt.chart.engine, diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AlphabeticalRelationComparator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AlphabeticalRelationComparator.java index 5ab360a5268..aad9dfa7883 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AlphabeticalRelationComparator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AlphabeticalRelationComparator.java @@ -16,6 +16,7 @@ import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Ryan D. Brooks @@ -33,7 +34,7 @@ public class AlphabeticalRelationComparator implements Comparator<RelationLink> try { return relationLink1.getArtifact(relationSide).compareTo(relationLink2.getArtifact(relationSide)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return 0; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java index 7b37f8643ce..f905067d3c0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java @@ -24,6 +24,7 @@ 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.ArtifactChangeListener; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * The basis for the comments in this class can be found at @@ -76,7 +77,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (parentElement instanceof Collection) { return ((Collection<?>) parentElement).toArray(); @@ -93,7 +94,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh try { return ((Artifact) element).getParent(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return null; @@ -124,7 +125,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh return false; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); // Assume it has children if an error happens return true; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java index 5270e09f7b3..4bea2198a09 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDecorator.java @@ -43,6 +43,7 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.AttributeTypeFilteredCheckTreeDialog; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.KeyedImage; @@ -92,7 +93,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { saveAction(attributesAction, "artifact.decorator.show.attrTypes"); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -111,7 +112,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { loadAction(attributesAction, "artifact.decorator.show.attrTypes"); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -165,7 +166,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { result = true; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); result = false; } return result; @@ -324,7 +325,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { try { Branch branch = branchProvider.getBranch(monitor); if (branch == null) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Branch not selected"); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Branch not selected"); } else { Collection<IAttributeType> selectableTypes = AttributeTypeManager.getValidAttributeTypes(branch); @@ -356,7 +357,7 @@ public class ArtifactDecorator implements IArtifactDecoratorPreferences { } } catch (OseeCoreException ex) { status = - new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Error opening attribute types dialog", ex); + new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening attribute types dialog", ex); } return status; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java index 25a14f263b0..2b649bbce8e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -41,18 +42,18 @@ public class ArtifactDoubleClick implements IDoubleClickListener { IStructuredSelection structuredSelection = (IStructuredSelection) selection; List<Artifact> artifacts = Handlers.getArtifactsFromStructuredSelection(structuredSelection); if (artifacts.isEmpty()) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "The artifact associated with the double-click was null"); + OseeLog.log(Activator.class, Level.SEVERE, "The artifact associated with the double-click was null"); } else { Artifact artifact = artifacts.iterator().next(); try { if (AccessControlManager.hasPermission(artifact, PermissionEnum.READ)) { RendererManager.openInJob(artifact, PresentationType.DEFAULT_OPEN); } else { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "The user " + UserManager.getUser() + " does not have read access to " + artifact); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java index 50cf03e28ef..3c5cc84cc16 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java @@ -94,6 +94,7 @@ import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPasteOperation; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; import org.eclipse.osee.framework.ui.skynet.dialogs.ArtifactPasteSpecialDialog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener; import org.eclipse.osee.framework.ui.skynet.menu.ArtifactTreeViewerGlobalMenuHelper; import org.eclipse.osee.framework.ui.skynet.menu.GlobalMenu; @@ -196,7 +197,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent private Control branchWarningComposite; private StackLayout stackLayout; private final ArtifactDecorator artifactDecorator = new ArtifactDecorator( - SkynetGuiPlugin.ARTIFACT_EXPLORER_ATTRIBUTES_PREF); + Activator.ARTIFACT_EXPLORER_ATTRIBUTES_PREF); private Label branchWarningLabel; public static void explore(Collection<Artifact> artifacts) { @@ -376,7 +377,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent getViewSite().getActionBars().updateActionBars(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } OseeEventManager.addListener(this); @@ -434,7 +435,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent stackComposite.layout(); stackComposite.getParent().layout(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -509,7 +510,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent } } } catch (Exception ex) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Error opening quick search", ex); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening quick search", ex); } return status; } @@ -543,7 +544,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent treeViewer.setExpandedElements(expandedPlus); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -584,7 +585,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent try { ChangeUiUtil.open(branch); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }; @@ -617,7 +618,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent try { Artifact parent = getParent(); - AccessPolicy policy = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy policy = Activator.getInstance().getAccessPolicy(); PermissionStatus status = policy.canRelationBeModified(parent, null, CoreRelationTypes.Default_Hierarchical__Child, Level.FINE); @@ -645,7 +646,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent "Access control has restricted this action. The current user does not have sufficient permission to create relations on this artifact."); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -702,7 +703,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent explore((Artifact) itemsIter.next()); treeViewer.setExpandedElements(expanded); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -727,7 +728,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent ArtifactExplorer.revealArtifact(ArtifactQuery.getArtifactFromId(artifact.getArtId(), branch)); } catch (OseeCoreException ex) { OseeLog.logf( - SkynetGuiPlugin.class, + Activator.class, OseeLevel.SEVERE_POPUP, "Could not find Artifact \'%s\' on Branch \'%s\'", artifact.getName(), branch.getName()); @@ -897,7 +898,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent myArtifact.setName(newLabel); myArtifact.persist(getClass().getSimpleName()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } treeViewer.refresh(); @@ -937,7 +938,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent refreshBranchWarning(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -962,7 +963,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent lockArtifacts.add(object); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -970,7 +971,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent AccessControlManager.unLockObjects(unlockArtifacts, UserManager.getUser()); AccessControlManager.lockObjects(lockArtifacts, UserManager.getUser()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -988,7 +989,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent try { performCopy(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -1007,7 +1008,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent artifactTransferData.add(artifact); } } - artifactClipboard.setArtifactsToClipboard(SkynetGuiPlugin.getInstance().getAccessPolicy(), + artifactClipboard.setArtifactsToClipboard(Activator.getInstance().getAccessPolicy(), artifactTransferData); } } @@ -1140,7 +1141,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent upAction.setEnabled(explorerRoot != null && explorerRoot.hasParent()); } catch (OseeCoreException ex) { upAction.setEnabled(false); - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -1223,7 +1224,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent treeViewer.setInput(explorerRoot); initializeSelectionBox(); } catch (IllegalArgumentException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -1248,7 +1249,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent boolean canModifyDH = false; if (obj instanceof Artifact) { Artifact art = (Artifact) obj; - AccessPolicy service = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy service = Activator.getInstance().getAccessPolicy(); canModifyDH = service.canRelationBeModified(art, null, CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched(); } @@ -1270,7 +1271,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent renameArtifactMenuItem.setEnabled(permiss.isWritePermission()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -1303,7 +1304,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -1370,7 +1371,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent }); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -1445,7 +1446,7 @@ public class ArtifactExplorer extends ViewPart implements IArtifactExplorerEvent private final ArtifactData artifactData; public CheckArtifactBeforeReveal(ArtifactData artifactData) { - super("Check Artifact Before Reveal", SkynetGuiPlugin.PLUGIN_ID); + super("Check Artifact Before Reveal", Activator.PLUGIN_ID); this.artifactData = artifactData; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java index f109f92f534..38a5ee0f748 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerDragAndDrop.java @@ -31,6 +31,7 @@ import org.eclipse.osee.framework.ui.plugin.util.Wizards; import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImportWizard; import org.eclipse.osee.framework.ui.skynet.Import.ArtifactImporter; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.update.InterArtifactExplorerDropHandler; import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; import org.eclipse.swt.dnd.DND; @@ -101,7 +102,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { ArtifactData toBeDropped = ArtifactTransfer.getInstance().nativeToJava(event.currentDataType); if (dropTarget != null && toBeDropped.getSource().equals(viewId)) { try { - AccessPolicy policy = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy policy = Activator.getInstance().getAccessPolicy(); valid = policy.canRelationBeModified(dropTarget, Arrays.asList(toBeDropped.getArtifacts()), CoreRelationTypes.Default_Hierarchical__Child, Level.FINE).matched(); @@ -120,7 +121,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); valid = false; } } @@ -158,7 +159,7 @@ public class ArtifactExplorerDragAndDrop extends SkynetDragAndDrop { interArtifactExplorerHandler.dropArtifactIntoDifferentBranch(parentArtifact, artifactsToBeRelated, true); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (isValidForArtifactDrop(event) && MessageDialog.openQuestion( viewPart.getViewSite().getShell(), diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java index 156264c8aed..852862d3c26 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorerEventManager.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact; import org.eclipse.osee.framework.skynet.core.event.model.EventModType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -86,7 +87,7 @@ public class ArtifactExplorerEventManager implements IArtifactEventListener { deletedPurgedArts.toArray(new Object[deletedPurgedArts.size()])); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler for deleted - " + handler, ex); } } @@ -113,7 +114,7 @@ public class ArtifactExplorerEventManager implements IArtifactEventListener { handler.getArtifactExplorer().getTreeViewer().refresh(art.getParent()); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -124,12 +125,12 @@ public class ArtifactExplorerEventManager implements IArtifactEventListener { handler.getArtifactExplorer().getTreeViewer().refresh(artifact); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler for modified - " + handler, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java index 5f54e3366cb..1a57105fe68 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactImageManager.java @@ -39,6 +39,7 @@ import org.eclipse.osee.framework.skynet.core.conflict.Conflict; import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.ui.skynet.artifact.annotation.ArtifactAnnotation; import org.eclipse.osee.framework.ui.skynet.artifact.annotation.AttributeAnnotationManager; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.KeyedImage; import org.eclipse.osee.framework.ui.swt.OverlayImage.Location; @@ -49,7 +50,7 @@ import org.eclipse.swt.graphics.Image; */ public final class ArtifactImageManager { private static final String EXTENSION_ELEMENT = "ArtifactImageProvider"; - private static final String EXTENSION_ID = SkynetGuiPlugin.PLUGIN_ID + "." + EXTENSION_ELEMENT; + private static final String EXTENSION_ID = Activator.PLUGIN_ID + "." + EXTENSION_ELEMENT; private static final String SELECT_ARTIFACT_TYPES_IMAGE_QUERY = "SELECT art_type_id, image FROM osee_artifact_type where image is not null"; @@ -96,7 +97,7 @@ public final class ArtifactImageManager { imageProvider.init(); } catch (Exception ex) { // prevent an exception in one provider from affecting the initialization of other providers - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -117,7 +118,7 @@ public final class ArtifactImageManager { BaseImage.getBaseImageEnum(artifactType, Lib.inputStreamToBytes(chStmt.getBinaryStream("image")))); artifactTypeImageProviderMap.put(artifactType, OSEE_DATABASE_PROVIDER); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } finally { @@ -199,7 +200,7 @@ public final class ArtifactImageManager { // Return image for the base image return ImageManager.getImage(BaseImage.getBaseImageEnum(artifactType)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return ImageManager.getImage(ImageManager.MISSING); } @@ -231,7 +232,7 @@ public final class ArtifactImageManager { // Database can override other providers, don't display error in that cases if (alreadyProvided && !providedByOseeDatabase) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.logf(Activator.class, Level.SEVERE, "Two ArtifactImageProviders [%s][%s] specify image for same artifact type [%s]", provider.getClass().getSimpleName(), artifactTypeImageProviderMap.get(artifactType), artifactType); } @@ -265,7 +266,7 @@ public final class ArtifactImageManager { return imageProvider.setupImage(castedArtifact); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return setupImageNoProviders(artifact); @@ -288,7 +289,7 @@ public final class ArtifactImageManager { return ImageManager.setupImageWithOverlay(baseImageEnum, FrameworkImage.WARNING_OVERLAY, Location.BOT_LEFT).getImageKey(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return ImageManager.setupImage(baseImageEnum); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java index 5f32f084038..657a1a636fd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactLabelProvider.java @@ -19,6 +19,7 @@ import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.search.ui.text.Match; import org.eclipse.swt.graphics.Image; @@ -91,7 +92,7 @@ public class ArtifactLabelProvider extends LabelProvider { //StyledCellLabelProv extraInfo.add(selectedAttributes); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); extraInfo.add(ex.toString()); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java index 7feae7d9ab6..958401af5cb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactValidationCheckOperation.java @@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; /** @@ -30,7 +31,7 @@ public class ArtifactValidationCheckOperation extends AbstractOperation { private final boolean stopOnFirstError; public ArtifactValidationCheckOperation(final Collection<Artifact> itemsToCheck, boolean stopOnFirstError) { - super("Validate Artifact(s)", SkynetGuiPlugin.PLUGIN_ID); + super("Validate Artifact(s)", Activator.PLUGIN_ID); this.stopOnFirstError = stopOnFirstError; this.itemsToCheck = new ArrayList<Artifact>(itemsToCheck); if (itemsToCheck != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java index 04ecc19909a..699bed9ac48 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.BooleanAttribute; import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute; import org.eclipse.osee.framework.skynet.core.attribute.EnumeratedAttribute; import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.DateValue; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.EnumeratedValue; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.StringValue; @@ -70,7 +71,7 @@ public class AttributeCellModifier implements ICellModifier { return false; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return property.equals("value"); @@ -125,7 +126,7 @@ public class AttributeCellModifier implements ICellModifier { attribute.setFromString((String) value); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } tableViewer.update(element, null); editor.onDirtied(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java index b99ba3d4bbe..b836d4e0056 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java @@ -16,6 +16,7 @@ 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.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Ryan D. Brooks @@ -33,7 +34,7 @@ public class AttributeContentProvider implements IStructuredContentProvider { try { return ((Artifact) inputElement).getAttributes().toArray(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return dummyArray; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java index 915ffabcb6a..fe2a8798e3c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeMenuSelectionListener.java @@ -15,6 +15,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -40,7 +41,7 @@ public class AttributeMenuSelectionListener extends SelectionAdapter { try { attrsComp.getArtifact().addAttribute(attributeType); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } tableViewer.refresh(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java index bd98e5f4e49..e0b2b8d9b5f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java @@ -30,6 +30,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.UniversalCellEditor; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; @@ -254,7 +255,7 @@ public class AttributesComposite extends Composite { try { attrItem.setEnabled(artifact.getRemainingAttributeCount((IAttributeType) attrItem.getData()) > 0); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -271,7 +272,7 @@ public class AttributesComposite extends Composite { item.addSelectionListener(listener); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } addItem.setMenu(attributesMenu); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java index cde7bbe3f0f..1f48d44576c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/BaseImage.java @@ -18,6 +18,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.KeyedImage; import org.eclipse.osee.framework.ui.swt.ProgramImage; import org.eclipse.swt.graphics.ImageData; @@ -41,7 +42,7 @@ public class BaseImage implements KeyedImage { @Override public String getImageKey() { - return SkynetGuiPlugin.PLUGIN_ID + ".artifact_type." + artifactType.getName(); + return Activator.PLUGIN_ID + ".artifact_type." + artifactType.getName(); } public static KeyedImage getBaseImageEnum(IArtifactType artifactType, byte[] imageData) { @@ -74,7 +75,7 @@ public class BaseImage implements KeyedImage { return new ProgramImage(extension); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return getBaseImageEnum(artifact.getArtifactType()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java index 4bcdec0b296..b33b9918db7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/FrameworkImage.java @@ -12,6 +12,7 @@ package org.eclipse.osee.framework.ui.skynet; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.KeyedImage; @@ -215,7 +216,7 @@ public enum FrameworkImage implements KeyedImage { @Override public ImageDescriptor createImageDescriptor() { if (alias == null) { - return ImageManager.createImageDescriptor(SkynetGuiPlugin.PLUGIN_ID, "images", fileName); + return ImageManager.createImageDescriptor(Activator.PLUGIN_ID, "images", fileName); } return alias.createImageDescriptor(); } @@ -223,7 +224,7 @@ public enum FrameworkImage implements KeyedImage { @Override public String getImageKey() { if (alias == null) { - return SkynetGuiPlugin.PLUGIN_ID + "." + fileName; + return Activator.PLUGIN_ID + "." + fileName; } return alias.getImageKey(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java index 2de11e12ce7..5ad03af7ab1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/HTMLTransferFormatter.java @@ -20,6 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactURL; import org.eclipse.osee.framework.skynet.core.preferences.PreferenceConstants; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -27,7 +28,7 @@ import org.eclipse.osee.framework.skynet.core.preferences.PreferenceConstants; public class HTMLTransferFormatter { private static final String START = "<A href=\""; private static final String END = "</A>"; - private static IPreferenceStore prefStore = SkynetGuiPlugin.getInstance().getPreferenceStore(); + private static IPreferenceStore prefStore = Activator.getInstance().getPreferenceStore(); public static String getHtml(Artifact... artifacts) { boolean applyWordTagWrap = @@ -50,7 +51,7 @@ public class HTMLTransferFormatter { link = String.format("guid:[%s] branch:[%s] gammaId:[%s]", artifact.getGuid(), artifact.getBranch().getId(), artifact.getGammaId()); - OseeLog.logf(SkynetGuiPlugin.class, Level.WARNING, + OseeLog.logf(Activator.class, Level.WARNING, ex, "Error creating link for: [%s]", artifact); } urls.add(link + "\">" + artifact.getName()); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java index 5dc3357a5e2..c486c631533 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportOperationFactory.java @@ -34,7 +34,7 @@ import org.eclipse.osee.framework.skynet.core.importing.parsers.IArtifactExtract import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.ArtifactValidationCheckOperation; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Robert A. Fisher @@ -56,7 +56,7 @@ public final class ArtifactImportOperationFactory { ops.add(new RoughToRealArtifactOperation(transaction, destinationArtifact, collector, resolver, false)); ops.add(new ArtifactValidationCheckOperation(destinationArtifact.getDescendants(), stopOnError)); ops.add(new CompleteArtifactImportOperation(transaction, destinationArtifact)); - return new CompositeOperation("Artifact Import", SkynetGuiPlugin.PLUGIN_ID, ops); + return new CompositeOperation("Artifact Import", Activator.PLUGIN_ID, ops); } public static IOperation createArtifactAndRoughToRealOperation(File sourceFile, Artifact destinationArtifact, OperationLogger logger, IArtifactExtractor extractor, IArtifactImportResolver resolver, RoughArtifactCollector collector, Collection<IArtifactType> selectionArtifactTypes, boolean stopOnError, boolean deleteUnMatched, boolean runFilterByAttributes) { @@ -68,7 +68,7 @@ public final class ArtifactImportOperationFactory { "Artifact Import - RoughToRealArtifactOperation, ArtifactValidationCheckOperation, CompleteArtifactImportOperation", destinationArtifact, resolver, stopOnError, collector, deleteUnMatched)); return new CompositeOperation("Artifact Import - ArtifactAndRoughToRealOperation, RoughToRealOperation", - SkynetGuiPlugin.PLUGIN_ID, ops); + Activator.PLUGIN_ID, ops); } /** @@ -81,7 +81,7 @@ public final class ArtifactImportOperationFactory { ops.add(new FilterArtifactTypesByAttributeTypes(destinationArtifact.getBranch(), collector, selectionArtifactTypes)); } - return new CompositeOperation(opDescription, SkynetGuiPlugin.PLUGIN_ID, ops); + return new CompositeOperation(opDescription, Activator.PLUGIN_ID, ops); } /** @@ -96,7 +96,7 @@ public final class ArtifactImportOperationFactory { deleteUnmatchedArtifacts)); final List<Artifact> children = new ArrayList<Artifact>(); - AbstractOperation operation = new AbstractOperation("Fetch Descendants", SkynetGuiPlugin.PLUGIN_ID) { + AbstractOperation operation = new AbstractOperation("Fetch Descendants", Activator.PLUGIN_ID) { @Override protected void doWork(IProgressMonitor monitor) throws Exception { try { @@ -116,6 +116,6 @@ public final class ArtifactImportOperationFactory { ops.add(new ArtifactValidationCheckOperation(children, stopOnError)); ops.add(new CompleteArtifactImportOperation(transaction, destinationArtifact)); - return new CompositeOperation(opName, SkynetGuiPlugin.PLUGIN_ID, ops); + return new CompositeOperation(opName, Activator.PLUGIN_ID, ops); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java index 04659e2cb78..07e1a414a7a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportPage.java @@ -42,7 +42,7 @@ import org.eclipse.osee.framework.skynet.core.importing.parsers.IArtifactExtract import org.eclipse.osee.framework.skynet.core.importing.parsers.IArtifactExtractorDelegate; import org.eclipse.osee.framework.ui.plugin.util.DirectoryOrFileSelector; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.panels.ArtifactExtractorSelectPanel; import org.eclipse.osee.framework.ui.skynet.panels.ArtifactSelectPanel; import org.eclipse.osee.framework.ui.skynet.panels.ArtifactTypeSelectPanel; @@ -373,7 +373,7 @@ public class ArtifactImportPage extends WizardDataTransferPage { Artifact artifact = ArtifactQuery.getArtifactFromId(guid, BranchManager.getBranchByGuid(branch)); artifactSelectPanel.setDefaultItem(artifact); } catch (OseeCoreException ex) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.logf(Activator.class, Level.SEVERE, "Unable to restore destination artifact- guid:[%s] branch guid:[%s]", guid, branch); } } @@ -387,7 +387,7 @@ public class ArtifactImportPage extends WizardDataTransferPage { ArtifactType artType = ArtifactTypeManager.getType(getArtifactType()); attributeTypeSelectPanel.setAllowedAttributeTypes(artType.getAttributeTypes(getDestinationArtifact().getBranch())); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else { attributeTypeSelectPanel.setAllowedAttributeTypes(new ArrayList<IAttributeType>()); @@ -456,7 +456,7 @@ public class ArtifactImportPage extends WizardDataTransferPage { attributeTypeSelectPanel.setAllowedAttributeTypes(specificArtifactType.getAttributeTypes(getDestinationArtifact().getBranch())); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java index a4bc1bd4f01..8bfe1bdbdc7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ArtifactImportWizard.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.Import; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.osee.framework.skynet.core.importing.resolvers.IArtifactImportResolver; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; @@ -31,7 +31,7 @@ public class ArtifactImportWizard extends Wizard implements IImportWizard { public ArtifactImportWizard(ArtifactImporter importer) { this.importer = importer; - setDialogSettings(SkynetGuiPlugin.getInstance().getDialogSettings()); + setDialogSettings(Activator.getInstance().getDialogSettings()); setWindowTitle("OSEE Artifact Import Wizard"); setNeedsProgressMonitor(true); setHelpAvailable(true); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java index 03218a9449b..a300d7dec20 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OpenContributionItem.java @@ -34,6 +34,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.IRenderer; import org.eclipse.osee.framework.ui.skynet.render.IRenderer.CommandGroup; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -216,7 +217,7 @@ public class OpenContributionItem extends ContributionItem { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return openWithItems; @@ -341,7 +342,7 @@ public class OpenContributionItem extends ContributionItem { handlerService.executeCommand(command.getId(), null); } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java index 5b67b61905e..9554c01a8df 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseePreferencePage.java @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.CorePreferences; import org.eclipse.osee.framework.skynet.core.preferences.PreferenceConstants; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -82,7 +83,7 @@ public class OseePreferencePage extends PreferencePage implements IWorkbenchPref try { addrs = Network.getLocalNetworkAdapters(); } catch (UnknownHostException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } networkButtons = new HashMap<InetAddress, Button>(); @@ -114,7 +115,7 @@ public class OseePreferencePage extends PreferencePage implements IWorkbenchPref } private void setupWordWrapChkButton() { - IPreferenceStore prefStore = SkynetGuiPlugin.getInstance().getPreferenceStore(); + IPreferenceStore prefStore = Activator.getInstance().getPreferenceStore(); wordWrapChkBox.setSelection(prefStore.getString(PreferenceConstants.WORDWRAP_KEY) != null && prefStore.getString( PreferenceConstants.WORDWRAP_KEY).equals(IPreferenceStore.TRUE)); } @@ -144,7 +145,7 @@ public class OseePreferencePage extends PreferencePage implements IWorkbenchPref @Override public void init(IWorkbench workbench) { // Initialize the preference store we wish to use - setPreferenceStore(SkynetGuiPlugin.getInstance().getPreferenceStore()); + setPreferenceStore(Activator.getInstance().getPreferenceStore()); } @Override @@ -168,7 +169,7 @@ public class OseePreferencePage extends PreferencePage implements IWorkbenchPref } } - SkynetGuiPlugin.getInstance().getPreferenceStore().putValue(PreferenceConstants.WORDWRAP_KEY, + Activator.getInstance().getPreferenceStore().putValue(PreferenceConstants.WORDWRAP_KEY, wordWrapChkBox.getSelection() ? IPreferenceStore.TRUE : IPreferenceStore.FALSE); return super.performOk(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeStatusContributionItemFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeStatusContributionItemFactory.java index f28080cb709..7025e52ae20 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeStatusContributionItemFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeStatusContributionItemFactory.java @@ -15,6 +15,7 @@ import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.OseeStatusContributionItem; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.part.IPageSite; import org.eclipse.ui.part.MultiPageEditorPart; import org.eclipse.ui.part.ViewPart; @@ -53,7 +54,7 @@ public final class OseeStatusContributionItemFactory { object.dispose(); } } catch (Exception ex) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error creating status line contribution item [%s]", contribClazz); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java index d441cb592f3..4803caa0e1e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/OseeUiEarlyStartup.java @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.ui.skynet; import java.util.logging.Level; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.ui.IPartListener; import org.eclipse.ui.IPerspectiveDescriptor; @@ -111,7 +112,7 @@ public class OseeUiEarlyStartup implements IStartup { bundle.start(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java index 0f7c4006a66..c3dfcc1374e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationCellModifier.java @@ -18,6 +18,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.widgets.Item; @@ -69,7 +70,7 @@ public class RelationCellModifier implements ICellModifier { return RelationManager.getRelationLink(relLink.getArtifactA(), relLink.getArtifactB(), relLink.getRelationType()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return null; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java index 21a415a2e9a..3ab9dc11491 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationContentProvider.java @@ -29,6 +29,7 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter; import org.eclipse.osee.framework.skynet.core.types.IArtifact; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * The basis for the comments in this class can be found at @@ -126,7 +127,7 @@ public class RelationContentProvider implements ITreeContentProvider { return wrapper; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return EMPTY_ARRAY; @@ -152,7 +153,7 @@ public class RelationContentProvider implements ITreeContentProvider { return RelationManager.getRelatedArtifactsCount(sorter.getArtifact(), sorter.getRelationType(), sorter.getSide()) > 0; } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return false; } } else if (element instanceof RelationType) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java index 442cfb3802a..bf775e182bc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationLabelProvider.java @@ -26,6 +26,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Image; @@ -51,7 +52,7 @@ public class RelationLabelProvider implements ITableLabelProvider, ILabelProvide try { toReturn = ArtifactImageManager.getImage(relationLinkWrapper.getOther()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (element instanceof RelationTypeSide && columnIndex == 0) { toReturn = getImage((RelationTypeSide) element); @@ -63,12 +64,12 @@ public class RelationLabelProvider implements ITableLabelProvider, ILabelProvide boolean isLocked = true; AccessPolicy policyHandlerService; try { - policyHandlerService = SkynetGuiPlugin.getInstance().getAccessPolicy(); + policyHandlerService = Activator.getInstance().getAccessPolicy(); PermissionStatus permissionStatus = policyHandlerService.canRelationBeModified(artifact, null, relationTypeSide, Level.FINE); isLocked = !permissionStatus.matched(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return isLocked; } @@ -121,7 +122,7 @@ public class RelationLabelProvider implements ITableLabelProvider, ILabelProvide try { return link.getArtifactOnOtherSide(artifact).getName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (columnIndex == 1) { return link.getRationale(); @@ -138,7 +139,7 @@ public class RelationLabelProvider implements ITableLabelProvider, ILabelProvide wrapper.getRelationType()); rationale = link.getRationale(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return rationale; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java index df6512f53bf..4eb6b0c0fd5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationOrderContributionItem.java @@ -23,6 +23,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ArmEvent; import org.eclipse.swt.events.ArmListener; @@ -38,7 +39,7 @@ import org.eclipse.swt.widgets.MenuItem; */ public class RelationOrderContributionItem extends ContributionItem { - public static final String ID = SkynetGuiPlugin.PLUGIN_ID + ".RelationOrder"; + public static final String ID = Activator.PLUGIN_ID + ".RelationOrder"; private static final String MENU_TEXT = "&Order Relations"; public static interface SelectionListener { @@ -125,7 +126,7 @@ public class RelationOrderContributionItem extends ContributionItem { try { listener.onSelected(sorter, wasId, isId); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -142,7 +143,7 @@ public class RelationOrderContributionItem extends ContributionItem { try { sorterId = sorter.getSorterId(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return sorterId; @@ -179,7 +180,7 @@ public class RelationOrderContributionItem extends ContributionItem { notifyListeners(sorter, sorterId, id); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java index f76f58cd8c9..7dd1dd95b33 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java @@ -51,6 +51,7 @@ import org.eclipse.osee.framework.ui.skynet.RelationOrderContributionItem.Select import org.eclipse.osee.framework.ui.skynet.action.RevealInExplorerAction; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.relation.explorer.RelationExplorerWindow; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -372,7 +373,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { try { RendererManager.open(link.getOther(), PresentationType.DEFAULT_OPEN); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -489,7 +490,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { WrapperForRelationLink data = (WrapperForRelationLink) selection.getFirstElement(); AccessPolicy policyHandlerService; try { - policyHandlerService = SkynetGuiPlugin.getInstance().getAccessPolicy(); + policyHandlerService = Activator.getInstance().getAccessPolicy(); RelationTypeSide rts = new RelationTypeSide(data.getRelationType(), data.getRelationSide()); valid = @@ -498,7 +499,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { java.util.Collections.singleton(data.getArtifactA().equals(artifact) ? data.getArtifactB() : data.getArtifactA()), rts, Level.INFO).matched(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -552,7 +553,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } refresh(); } @@ -576,7 +577,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { treeViewer.refresh(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (object instanceof RelationTypeSideSorter) { RelationTypeSideSorter group = (RelationTypeSideSorter) object; @@ -584,7 +585,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { RelationManager.deleteRelations(artifact, group.getRelationType(), group.getSide()); treeViewer.refresh(group); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -696,7 +697,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } } - AccessPolicy policyHandlerService = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy policyHandlerService = Activator.getInstance().getAccessPolicy(); boolean matched = policyHandlerService.canRelationBeModified(artifact, Arrays.asList(selectedArtifacts), data, @@ -719,7 +720,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (selected != null && selected.getData() instanceof WrapperForRelationLink) { @@ -730,7 +731,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { WrapperForRelationLink dropTarget = (WrapperForRelationLink) obj; boolean matched = false; try { - AccessPolicy policyHandlerService = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy policyHandlerService = Activator.getInstance().getAccessPolicy(); RelationTypeSide rts = new RelationTypeSide(dropTarget.getRelationType(), dropTarget.getRelationSide()); @@ -740,7 +741,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { Arrays.asList(artifact.equals(dropTarget.getArtifactA()) ? dropTarget.getArtifactB() : dropTarget.getArtifactA()), rts, Level.INFO).matched(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } if (!matched) { event.detail = DND.DROP_NONE; @@ -816,7 +817,7 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } isFeedbackAfter = false; @@ -838,13 +839,13 @@ public class RelationsComposite extends Composite implements ISelectedArtifact { artifacts.add(group.getArtifact()); } - AccessPolicy policyHandlerService = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy policyHandlerService = Activator.getInstance().getAccessPolicy(); hasPermission = policyHandlerService.canRelationBeModified(artifact, artifacts, relationTypeSide, Level.INFO).matched(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return hasPermission; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RevealInWorkspaceOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RevealInWorkspaceOperation.java index e8986af97e5..6ddb0a61f41 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RevealInWorkspaceOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RevealInWorkspaceOperation.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.ws.AWorkspace; /** @@ -30,7 +31,7 @@ public class RevealInWorkspaceOperation extends AbstractOperation { List<IResource> matches; public RevealInWorkspaceOperation(List<Artifact> artifacts, List<IResource> matches) { - super("Reveal In Workspace", SkynetGuiPlugin.PLUGIN_ID); + super("Reveal In Workspace", Activator.PLUGIN_ID); this.artifacts = artifacts; this.matches = matches; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java index 5853f25b343..182d8ed49ee 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SessionContributionItem.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.ui.plugin.OseeStatusContributionItem; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.dialogs.AuthenticationDialog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.OverlayImage; @@ -81,14 +82,14 @@ public final class SessionContributionItem extends OseeStatusContributionItem im event.setEventType(AccessControlEventType.UserAuthenticated); OseeEventManager.kickAccessControlArtifactsEvent(this, event); } catch (Exception 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); } } }); @@ -139,7 +140,7 @@ public final class SessionContributionItem extends OseeStatusContributionItem im userId = UserManager.getUser().getUserId(); sessionId = ClientSessionManager.getSessionId(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return String.format(ENABLED_TOOLTIP, skynetName, userId, sessionId); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java index 745f65753ab..7428519d4c7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java @@ -21,6 +21,7 @@ import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XOption; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData; @@ -159,7 +160,7 @@ public class XWidgetParser { } else if (value.equalsIgnoreCase("Vertically")) { dynamicXWidgetLayoutData.getXOptionHandler().add(XOption.FILL_VERTICALLY); } else { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, new IllegalArgumentException( + OseeLog.log(Activator.class, Level.WARNING, new IllegalArgumentException( "Unknown Fill Value \"" + value + "\"")); } } else if (nodeName.equals("height")) { @@ -173,7 +174,7 @@ public class XWidgetParser { } else if (value.equalsIgnoreCase("Center")) { dynamicXWidgetLayoutData.getXOptionHandler().add(XOption.ALIGN_CENTER); } else { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, new IllegalArgumentException( + OseeLog.log(Activator.class, Level.WARNING, new IllegalArgumentException( "Unknown Align Value \"" + value + "\"")); } } else if (nodeName.equals("defaultValue")) { @@ -181,7 +182,7 @@ public class XWidgetParser { } else if (nodeName.equals("keyedBranch")) { dynamicXWidgetLayoutData.setKeyedBranchName(node.getNodeValue()); } else { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, new OseeArgumentException( + OseeLog.log(Activator.class, Level.SEVERE, new OseeArgumentException( "Unsupported XWidget attribute \"" + nodeName + "\"")); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java index 7766ec53ea0..93cf1ea9042 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyDialog.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -74,7 +74,7 @@ public class PolicyDialog extends Dialog { try { setInputs(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } addListeners(); checkEnabled(); @@ -173,7 +173,7 @@ public class PolicyDialog extends Dialog { try { returnValue = AccessControlManager.hasPermission(accessControlledObject, PermissionEnum.WRITE); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); returnValue = false; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java index e6ceff7b82e..86ede726d33 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/access/PolicyTableViewer.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.PolicyTableXViewerFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -93,7 +93,7 @@ public class PolicyTableViewer { try { AccessControlManager.removeAccessControlDataIf(true, data); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } accessControlList.remove(data.getSubject().getGuid()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java index ef0db852b02..ef7cbce66ed 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CollapseAllAction.java @@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -50,7 +50,7 @@ public class CollapseAllAction extends Action { iCollapseAllHandler.expandAllActionHandler(); } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CompareTwoStringsAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CompareTwoStringsAction.java index 60535b31c2a..f4f3292cdb6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CompareTwoStringsAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/CompareTwoStringsAction.java @@ -15,9 +15,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler; import org.eclipse.osee.framework.ui.skynet.compare.CompareItem; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryEntryDialog; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.widgets.Event; @@ -52,7 +52,7 @@ public class CompareTwoStringsAction extends Action { }); ed.open(); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java index 9d0b3f0518f..fbf6637ec2f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/EditTransactionComment.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -55,7 +55,7 @@ public class EditTransactionComment extends Action { TransactionManager.setTransactionComment(record, ed.getEntry()); record.setComment(ed.getEntry()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } provider.refreshUI(records); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/ExpandAllAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/ExpandAllAction.java index 912d558c8a7..58dd942e354 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/ExpandAllAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/ExpandAllAction.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -74,7 +74,7 @@ public class ExpandAllAction extends Action { iExpandAllHandler.expandAllActionHandler(); } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java index 87a084117b0..a766c87f307 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/OpenAssociatedArtifactFromBranchProvider.java @@ -29,8 +29,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.operations.LoadAssociatedArtifactOperationFromBranch; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -65,7 +65,7 @@ public class OpenAssociatedArtifactFromBranchProvider extends Action { PresentationType.SPECIALIZED_EDIT); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Cannot access associated artifact.", ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Cannot access associated artifact.", ex); } } }); @@ -77,7 +77,7 @@ public class OpenAssociatedArtifactFromBranchProvider extends Action { try { associatedArtifact = BranchManager.getAssociatedArtifact(branchProvider.getBranch(null)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } ImageDescriptor descriptor; if (associatedArtifact != null && !(associatedArtifact instanceof User)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/RefreshAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/RefreshAction.java index bfc9ce84b84..09317b002af 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/RefreshAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/RefreshAction.java @@ -14,7 +14,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -39,7 +39,7 @@ public class RefreshAction extends Action { try { iRefreshActionHandler.refreshActionHandler(); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java index 33fb2c22f4d..a0358b90538 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/WasIsCompareEditorAction.java @@ -21,10 +21,10 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.change.Change; 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.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler; import org.eclipse.osee.framework.ui.skynet.compare.CompareItem; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.ui.PlatformUI; @@ -90,7 +90,7 @@ public class WasIsCompareEditorAction extends Action { isEnabled = selectionProvider.size() == 1; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return isEnabled; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java index ccf92b751eb..30e2e93d7bc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/action/browser/BrowserPrintAction.java @@ -14,7 +14,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -35,7 +35,7 @@ public class BrowserPrintAction extends Action { try { iBrowserActionHandler.getBrowser().setUrl("javascript:print()"); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java index ecfc47168b2..da70cab9b1c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPasteOperation.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactPasteConfiguration; /** @@ -42,7 +42,7 @@ public class ArtifactPasteOperation extends AbstractOperation { private final ArtifactNameConflictHandler nameConflictHandler; public ArtifactPasteOperation(ArtifactPasteConfiguration config, Artifact destination, List<Artifact> itemsToCopy, ArtifactNameConflictHandler nameConflictHandler) { - super("Paste Artifact(s)", SkynetGuiPlugin.PLUGIN_ID); + super("Paste Artifact(s)", Activator.PLUGIN_ID); this.itemsToCopy = itemsToCopy; this.destination = destination; this.config = config; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java index 1ee33bcffa2..ed65a9be0ef 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java @@ -17,8 +17,8 @@ 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.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.internal.ArtifactPromptService; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -31,7 +31,7 @@ public final class ArtifactPromptChange { } private static ArtifactPromptService getService() throws OseeCoreException { - return SkynetGuiPlugin.getInstance().getArtifactPromptService(); + return Activator.getInstance().getArtifactPromptService(); } public static boolean promptChangeAttribute(IAttributeType attributeType, final Collection<? extends Artifact> artifacts, boolean persist) { @@ -43,7 +43,7 @@ public final class ArtifactPromptChange { try { result = getService().promptChangeAttribute(attributeType, artifacts, persist, multiLine); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return result; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java index 0f29f014041..3acd8fb09aa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactSaveNotificationHandler.java @@ -30,8 +30,8 @@ import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.ArtifactDecoratorPreferences; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; import org.eclipse.osee.framework.ui.skynet.ArtifactViewerSorter; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEECheckedFilteredTree; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.SimpleCheckFilteredTreeDialog; @@ -62,7 +62,7 @@ public class ArtifactSaveNotificationHandler implements IWorkbenchListener { @Override public boolean preShutdown(IWorkbench arg0, boolean force) { boolean isShutdownAllowed = true; - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Verifying Artifact Persistence"); + OseeLog.log(Activator.class, Level.INFO, "Verifying Artifact Persistence"); Collection<Artifact> dirtyArts = ArtifactCache.getDirtyArtifacts(); if (!dirtyArts.isEmpty()) { @@ -84,12 +84,12 @@ public class ArtifactSaveNotificationHandler implements IWorkbenchListener { for (Entry<Branch, Collection<Artifact>> entry : branchMap.entrySet()) { Branch branch = entry.getKey(); Collection<Artifact> arts = entry.getValue(); - OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, + OseeLog.logf(Activator.class, Level.INFO, "Persisting [%d] unsaved artifacts for branch [%s]", arts.size(), branch); Artifacts.persistInTransaction("Artifact Save Notification", arts); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } else { @@ -103,7 +103,7 @@ public class ArtifactSaveNotificationHandler implements IWorkbenchListener { } } else { // For Test Purposes - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Found dirty artifacts after tests: " + dirtyArts); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java index d20090d9b65..be81ed92185 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactTransfer.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.dnd.ByteArrayTransfer; import org.eclipse.swt.dnd.TransferData; @@ -146,7 +146,7 @@ public class ArtifactTransfer extends ByteArrayTransfer { } return new ArtifactData(artifacts, url, source); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return null; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java index 40f4c32b988..8e214d30dc2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/MassEditDirtyArtifactOperation.java @@ -21,8 +21,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.IOperationFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -32,7 +32,7 @@ public class MassEditDirtyArtifactOperation extends AbstractOperation implements public static final String NAME = "Mass Edit Dirty Artifacts"; public MassEditDirtyArtifactOperation() { - super(NAME, SkynetGuiPlugin.PLUGIN_ID); + super(NAME, Activator.PLUGIN_ID); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java index e203170a784..4b45b162d44 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java @@ -20,7 +20,7 @@ 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.ArtifactDragDropSupport; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.swt.widgets.Shell; @@ -53,7 +53,7 @@ public class OpenArtifactAction implements IObjectActionDelegate { RendererManager.open(artifact, PresentationType.DEFAULT_OPEN); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else { MessageDialog.openInformation(targetPart.getSite().getShell(), "Open Associated Artifact", diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java index c7319dff9c4..15cdb561f6d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactEditorLoopbackCmd.java @@ -22,9 +22,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.httpRequests.BaseArtifactLoopbackCmd; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditorInput; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.ui.IEditorPart; @@ -46,7 +46,7 @@ public class OpenArtifactEditorLoopbackCmd extends BaseArtifactLoopbackCmd { try { hasPermissionToRead = AccessControlManager.hasPermission(artifact, PermissionEnum.READ); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } if (!hasPermissionToRead) { @@ -71,7 +71,7 @@ public class OpenArtifactEditorLoopbackCmd extends BaseArtifactLoopbackCmd { String.format("Unable to open: [%s]", artifact.getName())); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); httpResponse.outputStandardError(HttpURLConnection.HTTP_INTERNAL_ERROR, String.format("Unable to open: [%s]", artifact.getName()), ex); } finally { @@ -85,13 +85,13 @@ public class OpenArtifactEditorLoopbackCmd extends BaseArtifactLoopbackCmd { try { Thread.sleep(350); } catch (InterruptedException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } count++; } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); httpResponse.outputStandardError(HttpURLConnection.HTTP_INTERNAL_ERROR, String.format("Unable to open: [%s]", artifact.getName()), ex); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AnnotationComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AnnotationComposite.java index e05f8faf6c8..52a4a86ac6a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AnnotationComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AnnotationComposite.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -48,7 +48,7 @@ public class AnnotationComposite extends Composite { continue; } if (notify.getType() == ArtifactAnnotation.Type.None) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, new OseeStateException( + OseeLog.log(Activator.class, Level.SEVERE, new OseeStateException( "None is an invalid annotation type on artifact [%s]", artifact.getGuid())); continue; } @@ -59,7 +59,7 @@ public class AnnotationComposite extends Composite { alertLabel.setText(notify.getType().name() + ": " + notify.getContent()); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Exception resolving annotations", ex); + OseeLog.log(Activator.class, Level.SEVERE, "Exception resolving annotations", ex); } } if (toolkit != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationHandler.java index 8719581a2aa..3b006d1f5c3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/annotation/AttributeAnnotationHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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.internal.Activator; /** * @author Donald G. Dunne @@ -31,7 +31,7 @@ public class AttributeAnnotationHandler implements IArtifactAnnotation { annotations.addAll(mgr.getAnnotations()); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java index cf899205863..84219e763aa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java @@ -27,9 +27,9 @@ import org.eclipse.osee.framework.ui.skynet.AttributesComposite; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; import org.eclipse.osee.framework.ui.skynet.RelationsComposite; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.pages.ArtifactEditorOutlinePage; import org.eclipse.osee.framework.ui.skynet.artifact.editor.pages.ArtifactFormPage; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; @@ -104,7 +104,7 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { firePropertyChange(PROP_DIRTY); } catch (OseeCoreException ex) { onDirtied(); - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -117,11 +117,11 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { try { artifact.reloadAttributesAndRelations(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } finally { super.dispose(); } @@ -179,14 +179,14 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { try { addPage(formPage); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } try { if (EditorsPreferencePage.isIncludeAttributeTabOnArtifactEditor()) { createAttributesTab(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -225,7 +225,7 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { try { getEditorInput().getArtifact().persist("ArtifactEditor attribute tab persist"); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -238,7 +238,7 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { int attributesPageIndex = addPage(composite); setPageText(attributesPageIndex, "Attributes"); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -313,7 +313,7 @@ public class ArtifactEditor extends AbstractEventArtifactEditor { } onDirtied(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java index 3023a956049..f2bfa2f0bff 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorActionBarContributor.java @@ -32,9 +32,9 @@ import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.OpenContributionItem; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.access.PolicyDialog; import org.eclipse.osee.framework.ui.skynet.action.RevealInExplorerAction; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.osee.framework.ui.skynet.widgets.xHistory.HistoryView; import org.eclipse.osee.framework.ui.swt.Displays; @@ -130,7 +130,7 @@ public class ArtifactEditorActionBarContributor implements IActionContributor { getSelectedArtifact().deleteAndPersist(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -216,7 +216,7 @@ public class ArtifactEditorActionBarContributor implements IActionContributor { clipboard = new Clipboard(null); clipboard.setContents(new Object[] {url.toString()}, new Transfer[] {TextTransfer.getInstance()}); } catch (Exception ex) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, ex, + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error obtaining url for - guid: [%s] branch:[%s]", getSelectedArtifact().getGuid(), getSelectedArtifact().getBranch()); } finally { @@ -242,7 +242,7 @@ public class ArtifactEditorActionBarContributor implements IActionContributor { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView( "org.eclipse.ui.views.ContentOutline"); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Unable to open outline", ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Unable to open outline", ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java index 3c1d1b2743b..51e0ba001ea 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditorEventManager.java @@ -34,7 +34,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact import org.eclipse.osee.framework.skynet.core.event.model.EventModType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -93,7 +93,7 @@ public class ArtifactEditorEventManager implements IArtifactEventListener, IBran handler.closeEditor(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler for deleted - " + handler, ex); } } @@ -121,7 +121,7 @@ public class ArtifactEditorEventManager implements IArtifactEventListener, IBran } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler for modified - " + handler, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java index d52ad1c9b31..9c68ce50575 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/pages/ArtifactEditorOutlinePage.java @@ -28,10 +28,10 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.BaseArtifactEditorInput; import org.eclipse.osee.framework.ui.skynet.artifact.editor.sections.AttributeTypeUtil; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -195,7 +195,7 @@ public class ArtifactEditorOutlinePage extends ContentOutlinePage { Artifact artifact = (Artifact) element; return !artifact.getAttributeTypes().isEmpty(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return false; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java index 298730f3d5c..8c24964c018 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/AttributeFormPart.java @@ -28,9 +28,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.attribute.WordAttribute; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.sections.AttributeTypeUtil; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactStoredWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XOption; @@ -82,10 +82,10 @@ public class AttributeFormPart extends AbstractFormPart { public AttributeFormPart(ArtifactEditor editor) { this.editor = editor; try { - AccessPolicy policy = SkynetGuiPlugin.getInstance().getAccessPolicy(); + AccessPolicy policy = Activator.getInstance().getAccessPolicy(); decorator.addProvider(new XWidgetAccessDecorationProvider(policy)); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); } } @@ -112,7 +112,7 @@ public class AttributeFormPart extends AbstractFormPart { layoutControls(composite); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Unable to access attribute types", ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Unable to access attribute types", ex); } finally { composite.setVisible(true); } @@ -259,7 +259,7 @@ public class AttributeFormPart extends AbstractFormPart { saveCount++; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); } } } else { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/MessageSummaryNote.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/MessageSummaryNote.java index 899aede049e..8acb17e32d0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/MessageSummaryNote.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/parts/MessageSummaryNote.java @@ -15,7 +15,7 @@ import java.io.StringWriter; import org.eclipse.jface.dialogs.IMessageProvider; 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.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; @@ -92,7 +92,7 @@ public class MessageSummaryNote { c.setFocus(); } } catch (NumberFormatException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE, ex); } } }); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java index a3209c46c26..75e3076b2af 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeActionContribution.java @@ -17,9 +17,9 @@ 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.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.IActionContributor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; /** @@ -76,7 +76,7 @@ public class AttributeActionContribution implements IActionContributor { try { attributeTypeEditor.onAddAttributeType(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -93,7 +93,7 @@ public class AttributeActionContribution implements IActionContributor { try { attributeTypeEditor.onRemoveAttributeType(); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java index cb481f900f9..ab6e4ca592b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/sections/AttributeTypeEditDisplay.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.KeyedImage; import org.eclipse.swt.graphics.Image; @@ -56,7 +56,7 @@ public final class AttributeTypeEditDisplay implements AttributeTypeEditPresente @Override public IStatus validate(Object[] selection) { if (selection.length == 0) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Select at least one item or click cancel to exit."); } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java index d17495e79be..8a6c9400061 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java @@ -33,8 +33,8 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; @@ -76,7 +76,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio try { Artifacts.persistInTransaction("Mass Artifact Editor - Save", xViewer.getArtifacts()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } onDirtied(); } @@ -92,7 +92,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio Set<Artifact> accessibleArts = new HashSet<Artifact>(); for (Artifact artifact : artifacts) { if (!AccessControlManager.hasPermission(artifact, PermissionEnum.READ)) { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, + OseeLog.log(Activator.class, Level.INFO, "The user " + UserManager.getUser() + " does not have read access to " + artifact); accessControlFilteredResults = true; } else { @@ -110,7 +110,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio AWorkbench.popup("ERROR", "Some Artifacts not loaded due to access control limitations."); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }, options.contains(TableLoadOption.ForcePend)); @@ -164,7 +164,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio try { page.openEditor(input, EDITOR_ID); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -186,7 +186,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio taskArt.reloadAttributesAndRelations(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -251,7 +251,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IActio try { xViewer.set(((MassArtifactEditorInput) editorInput).getArtifacts()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } getSite().setSelectionProvider(xViewer); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java index 3378ab4e716..ebdc2f6e019 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java @@ -25,9 +25,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; @@ -87,7 +87,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { editor.onDirtied(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -121,7 +121,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { return true; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -197,7 +197,7 @@ public class MassXViewer extends XViewer implements IMassViewerEventHandler { } 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.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java index 70edff40efe..507beed6fe6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewerEventManager.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact; import org.eclipse.osee.framework.skynet.core.event.model.EventModType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -81,7 +81,7 @@ public class MassXViewerEventManager implements IArtifactEventListener { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler for deleted - " + handler, ex); } } @@ -104,7 +104,7 @@ public class MassXViewerEventManager implements IArtifactEventListener { handler.getMassXViewer().refresh(art); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "Error processing event handler for modified - " + handler, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/BooleanHandlePromptChange.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/BooleanHandlePromptChange.java index 2411ef3b08e..b122f7dfe7f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/BooleanHandlePromptChange.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/BooleanHandlePromptChange.java @@ -21,7 +21,7 @@ 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.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -44,7 +44,7 @@ public class BooleanHandlePromptChange implements IHandlePromptChange { try { set = artifacts.iterator().next().getSoleAttributeValue(attributeType, false); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/DateHandlePromptChange.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/DateHandlePromptChange.java index be6c51b833c..61b30c6b78e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/DateHandlePromptChange.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/DateHandlePromptChange.java @@ -19,7 +19,7 @@ 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.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.DateSelectionDialog; /** @@ -42,7 +42,7 @@ public class DateHandlePromptChange implements IHandlePromptChange { currentDate = artifacts.size() == 1 ? artifacts.iterator().next().getSoleAttributeValue(attributeType, (Date) null) : null; } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } this.diag = new DateSelectionDialog(diagTitle, diagTitle, currentDate); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java index 0f6d99060cf..6fa416817ec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/prompt/EnumeratedHandlePromptChange.java @@ -23,10 +23,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.EnumSelectionDialog; import org.eclipse.osee.framework.ui.skynet.artifact.EnumSelectionDialog.Selection; import org.eclipse.osee.framework.ui.skynet.artifact.EnumSingletonSelectionDialog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -48,7 +48,7 @@ public class EnumeratedHandlePromptChange implements IHandlePromptChange { try { isSingletonAttribute = AttributeTypeManager.getMaxOccurrences(attributeType) == 1; } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } if (isSingletonAttribute) { this.singletonDialog = new EnumSingletonSelectionDialog(attributeType, artifacts); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java index 215092e2536..2db0a9373c4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java @@ -33,8 +33,8 @@ import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.XWidgetParser; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; @@ -108,7 +108,7 @@ public abstract class AbstractBlam implements IDynamicWidgetLayoutListener { public String getXWidgetsXml() throws OseeCoreException { switch (source) { case FILE: - return getXWidgetsXmlFromUiFile(getClass().getSimpleName(), SkynetGuiPlugin.PLUGIN_ID); + return getXWidgetsXmlFromUiFile(getClass().getSimpleName(), Activator.PLUGIN_ID); case DEFAULT: default: return AbstractBlam.branchXWidgetXml; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java index 01ffd12e8a1..1af1d6652cb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamContributionManager.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateCommonItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemBlam; /** @@ -94,7 +94,7 @@ public class BlamContributionManager implements IXNavigateCommonItem { createCategories(category.split("\\."), 0, blamOperationItems, nameToParent); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java index ce5e4501fbf..2bc8d28f6e6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.ui.PartInitException; @@ -68,7 +68,7 @@ public class BlamEditor extends FormEditor implements IDirtiableEditor { overviewPage = new BlamOverviewPage(this); addPage(overviewPage); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -102,7 +102,7 @@ public class BlamEditor extends FormEditor implements IDirtiableEditor { try { AWorkbench.getActivePage().openEditor(blamEditorInput, EDITOR_ID); } catch (PartInitException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/ExecuteBlamOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/ExecuteBlamOperation.java index 23c2744214c..780b25453d3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/ExecuteBlamOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/ExecuteBlamOperation.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.blam; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.OperationLogger; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Ryan D. Brooks @@ -23,14 +23,14 @@ public class ExecuteBlamOperation extends AbstractOperation { private final VariableMap variableMap; public ExecuteBlamOperation(AbstractBlam blamOperation, VariableMap variableMap, OperationLogger logger) { - super(blamOperation.getName(), SkynetGuiPlugin.PLUGIN_ID, logger); + super(blamOperation.getName(), Activator.PLUGIN_ID, logger); this.variableMap = variableMap; this.blamOperation = blamOperation; } @Override protected void doWork(IProgressMonitor monitor) throws Exception { - blamOperation.setOseeDatabaseService(SkynetGuiPlugin.getInstance().getOseeDatabaseService()); + blamOperation.setOseeDatabaseService(Activator.getInstance().getOseeDatabaseService()); blamOperation.runOperation(variableMap, monitor); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OperationsPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OperationsPage.java index 4fdcac46da5..b5a9e757d93 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OperationsPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OperationsPage.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.osgi.framework.Bundle; /** @@ -44,9 +44,9 @@ public class OperationsPage { Class<?> renderClass = bundle.loadClass(classname); renderClass.newInstance(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } catch (NoClassDefFoundError er) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, + OseeLog.log(Activator.class, Level.WARNING, "Failed to find a class definition for " + classname + ", registered from bundle " + bundleName, er); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java index db21e4fd76e..9e7dfe277d1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/DatabaseHealth.java @@ -22,11 +22,11 @@ import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOperation; import org.eclipse.osee.framework.ui.skynet.dbHealth.DatabaseHealthOpsExtensionManager; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; @@ -111,7 +111,7 @@ public class DatabaseHealth extends AbstractBlam { private final Set<DatabaseHealthOperation> verifyOperations = new HashSet<DatabaseHealthOperation>(); public MasterDbHealthOperation(String operationName) { - super(operationName, SkynetGuiPlugin.PLUGIN_ID); + super(operationName, Activator.PLUGIN_ID); } public void addOperation(DatabaseHealthOperation operation, boolean isFixOperation) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java index 4d8c85ac120..2879380ee7e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java @@ -47,9 +47,9 @@ import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; @@ -131,7 +131,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam { } } catch (Exception ex) { badData.add(attrData.gammaId); - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, "Skiping File %s because of exception %s", + OseeLog.logf(Activator.class, Level.SEVERE, "Skiping File %s because of exception %s", attrData.getHrid(), ex); } @@ -148,7 +148,7 @@ public class FixTemplateContentArtifacts extends AbstractBlam { uploadResource(attrData.getGammaId(), resource); } catch (Exception ex) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, "Skiping File %s because of exception %s", + OseeLog.logf(Activator.class, Level.SEVERE, "Skiping File %s because of exception %s", attrData.getHrid(), ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java index c4bd7124cea..43ada2ce110 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java @@ -22,9 +22,9 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Image; @@ -93,7 +93,7 @@ public class SetWorkbenchOverrideIconBlam extends AbstractBlam { overrideImage(overideImage); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Error restoring .osee.data/workbenchOverride.gif image.", ex); + OseeLog.log(Activator.class, Level.SEVERE, "Error restoring .osee.data/workbenchOverride.gif image.", ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java index 2bf7f045fda..b8ea845b6ae 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/StringGuidsToArtifactListOperation.java @@ -11,7 +11,7 @@ import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.IXWidgetInputAddable; /** @@ -38,7 +38,7 @@ public class StringGuidsToArtifactListOperation extends AbstractOperation { * @param widget accepting input by implementing <code>IXWidgetInputAddable</code> interface */ public StringGuidsToArtifactListOperation(OperationLogger logger, String guidData, Branch branch, IXWidgetInputAddable widget) { - super(taskName, SkynetGuiPlugin.PLUGIN_ID, logger); + super(taskName, Activator.PLUGIN_ID, logger); this.rawGuidsData = guidData; this.branch = branch; this.widget = widget; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java index 095acd8b078..cc9b80dc62e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamInputSection.java @@ -15,9 +15,9 @@ import java.util.Collection; import java.util.List; 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.blam.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XWidgetUtility; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DefaultXWidgetOptionResolver; @@ -92,7 +92,7 @@ public class BlamInputSection extends BaseBlamSection { WorkPage workPage = new WorkPage(layoutDatas, new DefaultXWidgetOptionResolver(), getAbstractBlam()); workPage.createBody(getManagedForm(), parent, null, null, true); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java index 4af7312c59f..9141d6cc5fb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java @@ -16,8 +16,8 @@ import org.eclipse.osee.framework.core.operation.OperationLogger; 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.blam.AbstractBlam; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -131,7 +131,7 @@ public class BlamOutputSection extends BaseBlamSection { @Override public void log(Throwable th) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, th); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, th); } } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java index 68b6fb62581..7109b0b3cf2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchCheckTreeDialog.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.MinMaxOSEECheckedFilteredTreeDialog; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchViewImageHandler; import org.eclipse.swt.graphics.Image; @@ -68,7 +68,7 @@ public class BranchCheckTreeDialog extends MinMaxOSEECheckedFilteredTreeDialog { getTreeViewer().setInitalChecked(getInitialBranches()); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return comp; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java index 112f93d51c2..0e2061a53de 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchSelectComposite.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; @@ -96,7 +96,7 @@ public class BranchSelectComposite extends Composite { setSelected(BranchManager.getCommonBranch()); notifyListener(event); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java index 9cd9caa568a..f00b9475039 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInput.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.jface.resource.ImageDescriptor; 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.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Image; @@ -58,7 +58,7 @@ public class ChangeReportEditorInput implements IEditorInput, IPersistableElemen return this; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); } return null; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java index 8efb8c4c300..cc78cc5dbdc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeReportEditorInputFactory.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.SkynetViews; import org.eclipse.ui.IElementFactory; import org.eclipse.ui.IMemento; @@ -49,7 +49,7 @@ public class ChangeReportEditorInputFactory implements IElementFactory { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Change report error on init", ex); + OseeLog.log(Activator.class, Level.WARNING, "Change report error on init", ex); } return toReturn; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java index ea045fa69d8..9f2ffb0a48e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/ChangeUiUtil.java @@ -27,8 +27,8 @@ import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.view.ChangeReportEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.PartInitException; import org.eclipse.ui.progress.UIJob; @@ -82,7 +82,7 @@ public final class ChangeUiUtil { try { AWorkbench.getActivePage().openEditor(editorInput, ChangeReportEditor.EDITOR_ID); } catch (PartInitException ex) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Error opening change report", ex); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening change report", ex); } return status; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java index 1aafca0cc8f..4093de08bcb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/actions/OpenQuickSearchAction.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.QuickSearchView; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.ui.IViewPart; @@ -57,7 +57,7 @@ public class OpenQuickSearchAction extends Action { } } } catch (Exception ex) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Error opening quick search view", ex); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error opening quick search view", ex); } return status; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java index 941fe35a002..ba247290a69 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperation.java @@ -18,14 +18,14 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class LoadAssociatedArtifactOperation extends AbstractOperation { private final ChangeUiData changeData; public LoadAssociatedArtifactOperation(ChangeUiData changeData) { - super("Load Associated Artifact", SkynetGuiPlugin.PLUGIN_ID); + super("Load Associated Artifact", Activator.PLUGIN_ID); this.changeData = changeData; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java index 57ab63ca887..7452d565f76 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadAssociatedArtifactOperationFromBranch.java @@ -14,14 +14,14 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class LoadAssociatedArtifactOperationFromBranch extends AbstractOperation { private final IBranchProvider branchProvider; public LoadAssociatedArtifactOperationFromBranch(IBranchProvider branchProvider) { - super("Load Associated Artifact", SkynetGuiPlugin.PLUGIN_ID); + super("Load Associated Artifact", Activator.PLUGIN_ID); this.branchProvider = branchProvider; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java index acf16a81798..9bf45239653 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadChangesOperation.java @@ -16,14 +16,14 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.skynet.core.change.Change; import org.eclipse.osee.framework.skynet.core.revision.ChangeDataLoader; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class LoadChangesOperation extends AbstractOperation { private final ChangeUiData changeData; public LoadChangesOperation(ChangeUiData changeData) { - super("Load Change Data", SkynetGuiPlugin.PLUGIN_ID); + super("Load Change Data", Activator.PLUGIN_ID); this.changeData = changeData; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java index 7adbe668480..226589d7fe5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBaseToHead.java @@ -16,16 +16,16 @@ import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.CompareType; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class LoadCompareBaseToHead extends AbstractOperation { private final ChangeUiData uiData; public LoadCompareBaseToHead(ChangeUiData uiData) { - super("Load Data to compare from base to head transaction", SkynetGuiPlugin.PLUGIN_ID); + super("Load Data to compare from base to head transaction", Activator.PLUGIN_ID); this.uiData = uiData; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java index 8fe38337eee..07375c95e73 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/LoadCompareBranchToBranch.java @@ -19,9 +19,9 @@ import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.IBranchProvider; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.CompareType; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class LoadCompareBranchToBranch extends AbstractOperation { @@ -29,7 +29,7 @@ public class LoadCompareBranchToBranch extends AbstractOperation { private final IBranchProvider branchProvider; public LoadCompareBranchToBranch(ChangeUiData uiData, IBranchProvider branchProvider) { - super("Load data to compare different branches", SkynetGuiPlugin.PLUGIN_ID); + super("Load data to compare different branches", Activator.PLUGIN_ID); this.uiData = uiData; this.branchProvider = branchProvider; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java index 416ffb5f344..98cd90c1046 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/operations/UpdateChangeUiData.java @@ -19,15 +19,15 @@ import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.CompareType; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class UpdateChangeUiData extends AbstractOperation { private final ChangeUiData changeData; public UpdateChangeUiData(ChangeUiData changeData) { - super("Update Change Ui Data", SkynetGuiPlugin.PLUGIN_ID); + super("Update Change Ui Data", Activator.PLUGIN_ID); this.changeData = changeData; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java index 0a939a5788d..5b9c08dfaa6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/BaseToHeadHandler.java @@ -17,8 +17,8 @@ import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class BaseToHeadHandler implements IChangeReportUiHandler { @@ -39,7 +39,7 @@ public final class BaseToHeadHandler implements IChangeReportUiHandler { try { branchName = txDelta.getEndTx().getBranch().getShortName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; } return String.format("%s - All Changes", branchName); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java index d88fa153567..ab43472179c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/ChangeReportInfoPresenter.java @@ -20,9 +20,9 @@ import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.view.EditorSection; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.KeyedImage; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.IManagedForm; @@ -91,7 +91,7 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget { try { changeData.getCompareType().getHandler().appendTransactionInfoHtml(sb, changeData); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } sb.append("</p>"); @@ -104,7 +104,7 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget { try { sb.append(changeData.getCompareType().getHandler().getScenarioDescriptionHtml(changeData)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); sb.append(changeData.getCompareType().getHandler().getActionDescription()); } sb.append(""); @@ -127,7 +127,7 @@ public class ChangeReportInfoPresenter implements EditorSection.IWidget { User user = UserManager.getUserByArtId(transaction.getAuthor()); author = user.toString(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); author = "Unknown"; } DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java index 1ba1c8768b3..3828c173f33 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstOtherHandler.java @@ -16,8 +16,8 @@ import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler { @@ -38,7 +38,7 @@ public final class CurrentsAgainstOtherHandler implements IChangeReportUiHandler try { branchName = txDelta.getStartTx().getBranch().getShortName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; } return String.format("%s - Compared to Other Branch", branchName); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java index 7a58c36268a..63de28a735d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/CurrentsAgainstParentHandler.java @@ -16,8 +16,8 @@ import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class CurrentsAgainstParentHandler implements IChangeReportUiHandler { @@ -38,7 +38,7 @@ public final class CurrentsAgainstParentHandler implements IChangeReportUiHandle try { branchName = txDelta.getStartTx().getBranch().getShortName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; } return String.format("%s - Compared to Parent Branch", branchName); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java index 3372bf466de..ca377ff2b7b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/presenter/SpecificTxsHandler.java @@ -17,8 +17,8 @@ import org.eclipse.osee.framework.core.model.TransactionDelta; import org.eclipse.osee.framework.jdk.core.util.AXml; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.KeyedImage; public final class SpecificTxsHandler implements IChangeReportUiHandler { @@ -39,7 +39,7 @@ public final class SpecificTxsHandler implements IChangeReportUiHandler { try { branchName = txDelta.getEndTx().getBranch().getShortName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); branchName = "Unknown"; } String toReturn; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java index 5bdecb1dc21..b4efb8a3f5e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportEditor.java @@ -28,11 +28,11 @@ import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.skynet.core.event.model.TransactionChange; import org.eclipse.osee.framework.skynet.core.event.model.TransactionEvent; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeReportActionBarContributor; import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.IChangeReportView; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.PartInitException; import org.eclipse.ui.forms.editor.FormEditor; @@ -74,7 +74,7 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView changeReportPage = new ChangeReportPage(this); addPage(changeReportPage); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } OseeEventManager.addListener(eventRelay); } @@ -95,7 +95,7 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView branch1 = txDelta.getStartTx().getBranch(); branch2 = txDelta.getEndTx().getBranch(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); } if (txDelta.areOnTheSameBranch()) { sb.append(String.format("\nBranch - %s", branch1)); @@ -173,7 +173,7 @@ public class ChangeReportEditor extends FormEditor implements IChangeReportView branches[0] = changeUiData.getTxDelta().getStartTx().getBranch(); branches[1] = changeUiData.getTxDelta().getEndTx().getBranch(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Error obtaining change report branches for branch event", + OseeLog.log(Activator.class, Level.SEVERE, "Error obtaining change report branches for branch event", ex); } for (Branch branch : branches) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java index 5aa4df5878c..123a139e206 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/change/view/ChangeReportPage.java @@ -33,13 +33,13 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeReportEditorInput; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.operations.LoadAssociatedArtifactOperation; import org.eclipse.osee.framework.ui.skynet.change.operations.LoadChangesOperation; import org.eclipse.osee.framework.ui.skynet.change.operations.UpdateChangeUiData; import org.eclipse.osee.framework.ui.skynet.change.presenter.ChangeReportInfoPresenter; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeXViewer; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.Widgets; @@ -217,7 +217,7 @@ public class ChangeReportPage extends FormPage { ops.add(new LoadChangesOperation(changeData)); } ops.add(new LoadAssociatedArtifactOperation(changeData)); - IOperation operation = new CompositeOperation("Load Change Report Data", SkynetGuiPlugin.PLUGIN_ID, ops); + IOperation operation = new CompositeOperation("Load Change Report Data", Activator.PLUGIN_ID, ops); Operations.executeAsJob(operation, true, Job.LONG, new ReloadJobChangeAdapter()); } @@ -241,7 +241,7 @@ public class ChangeReportPage extends FormPage { public void done(IJobChangeEvent event) { super.done(event); String message = String.format("Change Report Load completed in [%s]", Lib.getElapseString(startTime)); - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, message); + OseeLog.log(Activator.class, Level.INFO, message); Job job = new UIJob("Refresh Change Report") { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java index 43afe5484b6..854b9a39ca5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/cm/OseeCm.java @@ -14,8 +14,8 @@ import java.util.logging.Level; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public final class OseeCm { @@ -28,7 +28,7 @@ public final class OseeCm { } oseeCmInstance = ServiceProvider.getOseeCmService(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); AWorkbench.popup("ERROR", ex.getLocalizedMessage()); } return oseeCmInstance; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java index 03dfd0c16b1..2f95cb8a9af 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ChangeReportHandler.java @@ -20,8 +20,8 @@ import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.PlatformUI; /** @@ -42,7 +42,7 @@ public class ChangeReportHandler extends AbstractHandler { ChangeUiUtil.open((IOseeBranch) selectedObject); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java index 31da67fa0ca..bbb0632bc11 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.word.WordUtil; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.ui.PlatformUI; @@ -74,7 +74,7 @@ public class CompressWordAttributesHandler extends AbstractHandler { monitor.done(); return Status.OK_STATUS; } catch (Exception ex) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, IStatus.OK, ex.getLocalizedMessage(), ex); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, ex.getLocalizedMessage(), ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java index e79cb057dcc..86d97fb5600 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CopyHandler.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactClipboard; import org.eclipse.search.ui.text.Match; import org.eclipse.ui.IWorkbenchPartSite; @@ -76,7 +76,7 @@ public class CopyHandler extends AbstractHandler { clipboard.setTextToClipboard(names); } else if (!names.isEmpty() && !artifacts.isEmpty()) { try { - clipboard.setArtifactsToClipboard(SkynetGuiPlugin.getInstance().getAccessPolicy(), artifacts); + clipboard.setArtifactsToClipboard(Activator.getInstance().getAccessPolicy(), artifacts); } catch (OseeCoreException ex) { throw new ExecutionException(ex.getLocalizedMessage()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java index e7592334ce7..f7e4440be0d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PurgeArtifactHandler.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.PurgeArtifacts; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.PlatformUI; /** @@ -53,8 +53,8 @@ public class PurgeArtifactHandler extends CommandHandler { Operations.executeWorkAndCheckStatus(new PurgeArtifacts(artifacts)); toReturn = Status.OK_STATUS; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); - toReturn = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); + toReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, ex.getMessage(), ex); } finally { monitor.done(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java index c636eb1aa05..4dc4c0ee441 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/BranchCreationHandler.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.swt.Displays; @@ -76,7 +76,7 @@ public class BranchCreationHandler extends CommandHandler { } }; - Jobs.runInJob("Create Branch", runnable, SkynetGuiPlugin.class, SkynetGuiPlugin.PLUGIN_ID); + Jobs.runInJob("Create Branch", runnable, Activator.class, Activator.PLUGIN_ID); } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java index fb90e61ff30..2ef3c247274 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/OpenAssociatedArtifactHandler.java @@ -25,11 +25,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService; import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -58,7 +58,7 @@ public class OpenAssociatedArtifactHandler extends CommandHandler { } } else { OseeLog.log( - SkynetGuiPlugin.class, + Activator.class, OseeLevel.SEVERE_POPUP, "The user " + UserManager.getUser() + " does not have read access to " + selectedBranch.getAssociatedArtifactId()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java index 52970effdf6..a71a317d22b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeBranchHandler.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Karol M. Wilk @@ -36,7 +36,7 @@ public final class PurgeBranchHandler extends GeneralBranchHandler { BranchManager.purgeBranch(branch); } } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java index c98e9ef7531..8600250f4c9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/PurgeTransactionHandler.java @@ -25,8 +25,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -55,7 +55,7 @@ public class PurgeTransactionHandler extends CommandHandler { try { BranchManager.refreshBranches(); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java index 7f986136839..0dca4d36262 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/RenameBranchHandler.java @@ -24,8 +24,8 @@ import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchXViewerFactory; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -129,7 +129,7 @@ public class RenameBranchHandler extends CommandHandler { BranchManager.persist(selectedBranch); } catch (Exception ex) { selectedBranch.setName(oldName); - 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.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java index 0b04d3cf4b6..994595868a5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowArchivedBranchHandler.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchOptionsEnum; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.ui.PlatformUI; @@ -68,7 +68,7 @@ public class ShowArchivedBranchHandler extends AbstractHandler implements IEleme try { isValid = AccessControlManager.isOseeAdmin(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return isValid; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java index 7e0920f0e3c..4ca2aad5a8f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ShowMergeBranchPresentationHandler.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchOptionsEnum; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.ui.PlatformUI; @@ -68,7 +68,7 @@ public final class ShowMergeBranchPresentationHandler extends AbstractHandler im try { isValid = AccessControlManager.isOseeAdmin(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return isValid; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java index 8f5f56cbec2..0c274b05524 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/ToggleFavoriteBranchContributionItem.java @@ -23,8 +23,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; @@ -67,7 +67,7 @@ public class ToggleFavoriteBranchContributionItem extends CompoundContributionIt contributionItems.add(contributionItem); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java index d51c9d12434..06b6d8da643 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitHandler.java @@ -30,8 +30,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchOptionsEnum; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView; import org.eclipse.osee.framework.ui.swt.Displays; @@ -116,7 +116,7 @@ public abstract class CommitHandler extends CommandHandler { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -180,7 +180,7 @@ public abstract class CommitHandler extends CommandHandler { try { commitBranch(new ConflictManagerExternal(destinationBranch, sourceBranch), archiveSourceBranch); } catch (OseeCoreException ex) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, ex.getLocalizedMessage(), ex); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getLocalizedMessage(), ex); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java index 444e782e5e1..ca53f369ee8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/CommitIntoParentCompoundContributionItem.java @@ -25,9 +25,9 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.skynet.commandHandlers.merge.BranchIdParameter; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.swt.SWT; import org.eclipse.ui.PlatformUI; @@ -78,7 +78,7 @@ public class CommitIntoParentCompoundContributionItem extends CompoundContributi contributionItems.add(contributionItem); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -109,7 +109,7 @@ public class CommitIntoParentCompoundContributionItem extends CompoundContributi command.define(command.getName(), "", commandService.getCategory("org.eclipse.debug.ui.category.run"), BRANCH_COMMIT_PARAMETER_DEF); } catch (NotDefinedException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return command; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java index ab792bfcb67..573d19b9402 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/branch/commit/UpdateBranchHandler.java @@ -28,8 +28,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.update.ConflictResolverOp import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; @@ -94,7 +94,7 @@ public class UpdateBranchHandler extends CommandHandler { private static final class UserConflictResolver extends ConflictResolverOperation { public UserConflictResolver() { - super("Launch Merge Manager", SkynetGuiPlugin.PLUGIN_ID); + super("Launch Merge Manager", Activator.PLUGIN_ID); } @Override @@ -120,7 +120,7 @@ public class UpdateBranchHandler extends CommandHandler { mergeView.explore(sourceBranch, destinationBranch, null, null, true); } } catch (PartInitException ex) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Error launching merge view", ex); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error launching merge view", ex); } return status; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java index d4a58d0100b..ea8b7b15133 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeCompoundContributionItem.java @@ -28,8 +28,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.swt.SWT; import org.eclipse.ui.PlatformUI; @@ -88,7 +88,7 @@ public class MergeCompoundContributionItem extends CompoundContributionItem { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -117,7 +117,7 @@ public class MergeCompoundContributionItem extends CompoundContributionItem { command.define(command.getName(), "", commandService.getCategory("org.eclipse.debug.ui.category.run"), BRANCH_PARAMETER_DEF); } catch (NotDefinedException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return command; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java index d5f38959765..241f5bd2660 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/merge/MergeManagerHandler.java @@ -22,9 +22,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.CommandHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.commandHandlers.Handlers; import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView; @@ -70,7 +70,7 @@ public class MergeManagerHandler extends CommandHandler { selectedBranch != null && !(ServiceProvider.getOseeCmService().isPcrArtifact(BranchManager.getAssociatedArtifact(selectedBranch))) && selectedBranch.hasParentBranch(); } } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/OtherEditorHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/OtherEditorHandler.java index da795db1538..02479682562 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/OtherEditorHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/renderer/handlers/OtherEditorHandler.java @@ -16,7 +16,7 @@ import org.eclipse.jface.window.Window; 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.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.NativeRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.ui.IEditorDescriptor; @@ -71,7 +71,7 @@ public class OtherEditorHandler extends AbstractEditorHandler { IDE.setDefaultEditor(file, editorId); } } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Open Editor Error", ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Open Editor Error", ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java index df932f11943..1315d8337b2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/AbstractWordAttributeHealthOperation.java @@ -43,7 +43,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Roberto E. Escobar @@ -110,7 +110,7 @@ public abstract class AbstractWordAttributeHealthOperation extends DatabaseHealt private final List<AttrData> attributesWithErrors; public FindAllWordAttributesNeedingFix(String operationName, List<AttrData> attributesWithErrors) { - super(operationName, SkynetGuiPlugin.PLUGIN_ID); + super(operationName, Activator.PLUGIN_ID); this.attributesWithErrors = attributesWithErrors; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOperation.java index 27e0b95ce66..0a64d6d346f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOperation.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.skynet.dbHealth; import java.io.IOException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.MultiPageResultsProvider; /** @@ -30,7 +30,7 @@ public abstract class DatabaseHealthOperation extends AbstractOperation { private final MultiPageResultsProvider resultsProvider = new MultiPageResultsProvider(this); protected DatabaseHealthOperation(String operationName) { - super(operationName, SkynetGuiPlugin.PLUGIN_ID); + super(operationName, Activator.PLUGIN_ID); this.isFixOperationEnabled = false; this.appendableBuffer = new StringBuilder(); this.detailedReport = new StringBuilder(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java index 02ca399a10f..a7c3ba9466f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dbHealth/DatabaseHealthOpsExtensionManager.java @@ -16,7 +16,7 @@ import java.util.Set; import java.util.TreeMap; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Roberto E. Escobar @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; public class DatabaseHealthOpsExtensionManager { private static final String EXTENSION_ELEMENT = "DatabaseHealthOperation"; private static final String CLASS_ATTRIBUTE_NAME = "className"; - private static final String EXTENSION_POINT = SkynetGuiPlugin.PLUGIN_ID + "." + EXTENSION_ELEMENT; + private static final String EXTENSION_POINT = Activator.PLUGIN_ID + "." + EXTENSION_ELEMENT; private static final Map<String, DatabaseHealthOperation> fixOps = new TreeMap<String, DatabaseHealthOperation>(); private static final Map<String, DatabaseHealthOperation> verifyOps = new TreeMap<String, DatabaseHealthOperation>(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java index 5f7e1d12696..df2a9d59cd2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/dialogs/ArtifactSelectionDialog.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactContentProvider; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XBranchSelectWidget; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; @@ -58,7 +58,7 @@ public class ArtifactSelectionDialog extends SelectionStatusDialog { private int fWidth = 60; private int fHeight = 18; private boolean fIsEmpty; - private IStatus currentStatus = new Status(IStatus.OK, SkynetGuiPlugin.PLUGIN_ID, 0, "", null); + private IStatus currentStatus = new Status(IStatus.OK, Activator.PLUGIN_ID, 0, "", null); private ISelectionStatusValidator validator; private final ITreeContentProvider contentProvider; private final ILabelProvider labelProvider; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportJob.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportJob.java index a493dfe58ec..65dca9ae5c2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportJob.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportJob.java @@ -23,7 +23,7 @@ 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.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -48,14 +48,14 @@ public class ArtifactExportJob extends Job { for (Artifact artifact : exportArtifacts) { if (monitor.isCanceled()) { - return new Status(IStatus.CANCEL, SkynetGuiPlugin.PLUGIN_ID, "User Cancled the operation."); + return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, "User Cancled the operation."); } writeArtifactPreview(rootExportPath, monitor, artifact); } toReturn = Status.OK_STATUS; } catch (Exception ex) { - toReturn = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, -1, ex.getLocalizedMessage(), ex); + toReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, ex.getLocalizedMessage(), ex); } finally { monitor.done(); } @@ -81,7 +81,7 @@ public class ArtifactExportJob extends Job { try { RendererManager.open(artifact, PresentationType.PREVIEW); } catch (OseeArgumentException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } monitor.worked(1); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java index f16e285856c..a8143b2903f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.OseeData; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.search.ui.text.Match; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -56,7 +56,7 @@ public class ArtifactExportPage extends WizardDataTransferPage { if (selectedObject instanceof Artifact) { selectedArtifacts.add((Artifact) selectedObject); } else { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Expected selection to be of type Artifact"); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Expected selection to be of type Artifact"); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java index 579c08fe89e..7b585dce880 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java @@ -45,7 +45,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.OpenContributionItem; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite; import org.eclipse.osee.framework.ui.skynet.widgets.XBranchSelectWidget; @@ -121,7 +121,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I refresh(); groupExpDnd.setBranch(branch); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -167,7 +167,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I try { handleRemoveFromGroup(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -180,7 +180,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I try { handleDeleteGroup(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -246,7 +246,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I UniversalGroup.addGroup(ed.getEntry(), branch); treeViewer.refresh(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -272,7 +272,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I } transaction.execute(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -305,7 +305,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I transaction.execute(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -374,7 +374,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I try { topArt = UniversalGroup.getTopUniversalGroupArtifact(branch); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } if (topArt == null) { @@ -440,7 +440,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I try { memento.putInteger(BRANCH_ID, BranchManager.getBranchId(branch)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -468,7 +468,7 @@ public class GroupExplorer extends ViewPart implements IArtifactEventListener, I } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Group Explorer exception on init", ex); + OseeLog.log(Activator.class, Level.WARNING, "Group Explorer exception on init", ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java index 31c3a96dc03..8065ebb75de 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java @@ -30,8 +30,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; @@ -270,7 +270,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { isFeedbackAfter = false; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -303,7 +303,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { } dragOverExplorerItem.getArtifact().persist("Drag and drop: copy artifacts to group"); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java index 88f8321dcc8..675057d2bc6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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.internal.Activator; /** * @author Donald G. Dunne @@ -123,7 +123,7 @@ public class GroupExplorerItem implements IAdaptable { addGroupItem(new GroupExplorerItem(treeViewer, art, this, groupExplorer)); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } List<GroupExplorerItem> items = new ArrayList<GroupExplorerItem>(); if (groupItems != null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupLabelProvider.java index 8c092764eaf..5cd453f15cc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupLabelProvider.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.util.IGroupExplorerProvider; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Image; @@ -55,7 +55,7 @@ public class GroupLabelProvider extends LabelProvider { return ((IGroupExplorerProvider) artifact).getGroupExplorerName(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } String name = artifact.getName(); if (name == null) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java index 82d7a9c7334..c2e76f01511 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/RemoveTrackChangesHandler.java @@ -18,7 +18,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.jdk.core.type.MutableBoolean; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; @@ -63,7 +63,7 @@ public class RemoveTrackChangesHandler implements IStatusHandler { } else { // For Test Purposes isOkToRemove.setValue(true); - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Test - accept track change removal."); + OseeLog.log(Activator.class, Level.INFO, "Test - accept track change removal."); } return answer; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java index 7177466c252..bd0f7cec93a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/handler/UIOutlineResolutionHandler.java @@ -20,7 +20,7 @@ import org.eclipse.debug.core.IStatusHandler; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate.ContentType; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; /** @@ -50,7 +50,7 @@ public class UIOutlineResolutionHandler implements IStatusHandler { return mutableBoolean.booleanValue() ? ContentType.OUTLINE_TITLE : ContentType.CONTENT; } - throw new CoreException(new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, + throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Invalid source object in UIOutlineResolutionHandler")); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/Activator.java index 283839da5eb..911729c4d16 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/internal/Activator.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.ui.skynet; +package org.eclipse.osee.framework.ui.skynet.internal; import java.util.HashMap; import java.util.Map; @@ -33,10 +33,9 @@ import org.eclipse.osee.framework.skynet.core.event.model.BroadcastEventType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.skynet.core.utility.DbUtil; import org.eclipse.osee.framework.ui.plugin.OseeUiActivator; +import org.eclipse.osee.framework.ui.skynet.DialogPopupLoggerListener; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactSaveNotificationHandler; import org.eclipse.osee.framework.ui.skynet.blam.operation.SetWorkbenchOverrideIconBlam; -import org.eclipse.osee.framework.ui.skynet.internal.ArtifactPromptService; -import org.eclipse.osee.framework.ui.skynet.internal.ArtifactPromptServiceRegHandler; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchListener; @@ -45,8 +44,8 @@ import org.osgi.framework.BundleContext; import org.osgi.service.packageadmin.PackageAdmin; import org.osgi.util.tracker.ServiceTracker; -public class SkynetGuiPlugin extends OseeUiActivator implements IBroadcastEventListener, IOseeDatabaseServiceProvider { - private static SkynetGuiPlugin pluginInstance; // The shared instance. +public class Activator extends OseeUiActivator implements IBroadcastEventListener, IOseeDatabaseServiceProvider { + private static Activator pluginInstance; // The shared instance. public static final String PLUGIN_ID = "org.eclipse.osee.framework.ui.skynet"; public static final String CHANGE_REPORT_ATTRIBUTES_PREF = "org.eclipse.osee.framework.ui.skynet.changeReportAttributes"; @@ -62,7 +61,7 @@ public class SkynetGuiPlugin extends OseeUiActivator implements IBroadcastEventL private final Map<String, ServiceDependencyTracker> trackers = new HashMap<String, ServiceDependencyTracker>(); - public SkynetGuiPlugin() { + public Activator() { super(PLUGIN_ID); pluginInstance = this; } @@ -141,7 +140,7 @@ public class SkynetGuiPlugin extends OseeUiActivator implements IBroadcastEventL } } - public static SkynetGuiPlugin getInstance() { + public static Activator getInstance() { return pluginInstance; } @@ -210,7 +209,7 @@ public class SkynetGuiPlugin extends OseeUiActivator implements IBroadcastEventL OseeEventManager.kickBroadcastEvent(this, new BroadcastEvent(BroadcastEventType.Pong, null, sender.getOseeSession().toString())); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (broadcastEvent.getBroadcastEventType() == BroadcastEventType.Pong) { // Got pong from another client; If message == this client's sessionId, then it's @@ -218,10 +217,10 @@ public class SkynetGuiPlugin extends OseeUiActivator implements IBroadcastEventL try { if (broadcastEvent.getMessage() != null && broadcastEvent.getMessage().equals( ClientSessionManager.getSession().toString())) { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Pong: " + sender.toString()); + OseeLog.log(Activator.class, Level.INFO, "Pong: " + sender.toString()); } } catch (OseeAuthenticationRequiredException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Pong: " + sender.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, "Pong: " + sender.toString(), ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java index b21bf53f590..4d7b6e9dc9d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/CompareArtifactAction.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.skynet.core.change.Change; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.IRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -63,7 +63,7 @@ public final class CompareArtifactAction extends Action { try { processSelectedArtifacts(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -78,7 +78,7 @@ public final class CompareArtifactAction extends Action { isValidSelection = renderer.supportsCompare(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return isValidSelection; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java index c2eecc7b0fb..171cf5a002e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManage import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; 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.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.SWT; @@ -112,7 +112,7 @@ public class GlobalMenu { purgeMenuItem.setEnabled(permiss.isHasArtifacts() && AccessControlManager.isOseeAdmin()); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -149,7 +149,7 @@ public class GlobalMenu { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } Artifact[] artifactsArray = artifactsToBeDeleted.toArray(new Artifact[artifactsToBeDeleted.size()]); @@ -163,11 +163,11 @@ public class GlobalMenu { listener.actioned(GlobalMenuItem.DeleteArtifacts, artifactsToBeDeleted); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -196,12 +196,12 @@ public class GlobalMenu { for (GlobalMenuListener listener : listeners) { Result result = listener.actioning(GlobalMenuItem.PurgeArtifacts, artifactsToBePurged); if (result.isFalse()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, IStatus.OK, result.getText(), + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, result.getText(), null); } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } monitor.beginTask("Purge artifact", artifactsToBePurged.size()); @@ -215,8 +215,8 @@ public class GlobalMenu { } toReturn = Status.OK_STATUS; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); - toReturn = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); + toReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, ex.getMessage(), ex); } finally { monitor.done(); } @@ -227,7 +227,7 @@ public class GlobalMenu { listener.actioned(GlobalMenuItem.PurgeArtifacts, artifactsToBePurged); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return toReturn; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java index a6e5975a8ce..910c676bf8b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java @@ -17,7 +17,7 @@ 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.conflict.AttributeConflict; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; @@ -74,7 +74,7 @@ public class EditAttributeWizardPage extends WizardPage { } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } getWizard().getContainer().updateButtons(); } @@ -91,7 +91,7 @@ public class EditAttributeWizardPage extends WizardPage { conflict.getSourceDisplayData(), Arrays.asList(conflict), true); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -131,7 +131,7 @@ public class EditAttributeWizardPage extends WizardPage { new Label(composite, SWT.NONE).setText(DEST_TEXT); new Label(composite, SWT.NONE).setText(ConflictResolutionWizard.INDENT + conflict.getDestDisplayData()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Composite buttonComp = new Composite(composite, SWT.NONE); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java index eaa9f2cf961..775e9b84769 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java @@ -15,7 +15,7 @@ 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.conflict.AttributeConflict; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility; @@ -116,7 +116,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { MergeUtility.launchMerge(conflict, getShell()); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } getWizard().getContainer().updateButtons(); } @@ -130,7 +130,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { changeType = conflict.getAttributeType().getName(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -155,7 +155,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { new Label(composite, SWT.NONE).setText(ConflictResolutionWizard.TYPE_TEXT); new Label(composite, SWT.NONE).setText(ConflictResolutionWizard.INDENT + changeType); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } new Label(composite, SWT.NONE); @@ -189,7 +189,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { try { setResolution(XMergeLabelProvider.getMergeImage(conflict)); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } setControl(composite); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java index fed5a20f1f8..3483edb441a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -80,11 +80,11 @@ public class EmbeddedBooleanAttributeEditor implements IEmbeddedAttributeEditor if (object instanceof Boolean) { editor.setEntry(((Boolean) object).booleanValue()); } else { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, new Exception( + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, new Exception( "Boolean editor did not receive a boolean value")); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } if (obj instanceof AttributeConflict) { @@ -94,7 +94,7 @@ public class EmbeddedBooleanAttributeEditor implements IEmbeddedAttributeEditor } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return true; } @@ -126,7 +126,7 @@ public class EmbeddedBooleanAttributeEditor implements IEmbeddedAttributeEditor } return true; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } AWorkbench.popup("ERROR", "Could not store the attribute"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java index 10a7e65256e..9e7ffb76a81 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -80,7 +80,7 @@ public class EmbeddedDateAttributeEditor implements IEmbeddedAttributeEditor { date = (Date) object; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } if (obj instanceof AttributeConflict) { @@ -90,7 +90,7 @@ public class EmbeddedDateAttributeEditor implements IEmbeddedAttributeEditor { date = (Date) object; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -133,7 +133,7 @@ public class EmbeddedDateAttributeEditor implements IEmbeddedAttributeEditor { } return true; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } AWorkbench.popup("ERROR", "Could not store the attribute"); return false; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java index 7e257748159..2643e35d8ca 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -90,13 +90,13 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { editor.addSelectionChoice(string); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } if (obj instanceof Artifact) { try { editor.setSelected(((Artifact) obj).getSoleAttributeValue(attributeType).toString()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (obj instanceof AttributeConflict) { try { @@ -104,7 +104,7 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { editor.setSelected(((AttributeConflict) obj).getMergeObject().toString()); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return true; @@ -140,7 +140,7 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { } return true; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return true; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java index e889dae753e..d8b2d7f814b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -84,7 +84,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { try { editor.setEntry(((Artifact) obj).getSoleAttributeValue(attributeType).toString()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (obj instanceof AttributeConflict) { try { @@ -92,7 +92,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { editor.setEntry(((AttributeConflict) obj).getMergeObject().toString()); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } if (regExp != null) { @@ -126,7 +126,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { AWorkbench.popup("Attention", MergeUtility.COMMITED_PROMPT); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else { if (!((AttributeConflict) object).clearValue()) { @@ -137,7 +137,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { } 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.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java index d5766b12297..cb0c4570d14 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.FloatingPointAttribute; import org.eclipse.osee.framework.skynet.core.attribute.IntegerAttribute; import org.eclipse.osee.framework.skynet.core.attribute.StringAttribute; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Theron Virgin @@ -53,7 +53,7 @@ public class EmbededAttributeEditorFactory { AWorkbench.popup("ERROR", "Unhandled attribute type. No editor defined for this type"); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeEmail.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeEmail.java index 7a3bb40da66..8b36c62a311 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeEmail.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeEmail.java @@ -37,7 +37,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExportClassLoader; import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Michael A. Winston @@ -90,7 +90,7 @@ public class OseeEmail extends MimeMessage { } } catch (MessagingException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -278,7 +278,7 @@ public class OseeEmail extends MimeMessage { try { email.sendLocalThread(); } catch (MessagingException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -298,7 +298,7 @@ public class OseeEmail extends MimeMessage { // Set class loader so can find the mail handlers Thread.currentThread().setContextClassLoader( - new ExportClassLoader(SkynetGuiPlugin.getInstance().getPackageAdmin())); + new ExportClassLoader(Activator.getInstance().getPackageAdmin())); if (bodyType == null) { bodyType = plainText; body = ""; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotificationManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotificationManager.java index 95fc809c9f4..17c08ea8d1c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotificationManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotificationManager.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.utility.INotificationManager; import org.eclipse.osee.framework.skynet.core.utility.OseeNotificationEvent; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * Stores notification events generated by the framework or applications. Currently, send happens upon call to @@ -51,7 +51,7 @@ public class OseeNotificationManager implements INotificationManager { @Override public void sendNotifications() { if (!emailEnabled) { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Osee Notification Disabled"); + OseeLog.log(Activator.class, Level.INFO, "Osee Notification Disabled"); return; } List<OseeNotificationEvent> sendEvents = new ArrayList<OseeNotificationEvent>(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java index 8e3ef946ffa..c3b0671c57a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.utility.EmailUtil; import org.eclipse.osee.framework.skynet.core.utility.OseeNotificationEvent; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.notify.OseeEmail.BodyType; /** @@ -46,7 +46,7 @@ public class OseeNotifyUsersJob extends Job { super("Notifying Users"); this.notificationEvents = notificationEvents; if (testing) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.log(Activator.class, Level.SEVERE, "OseeNotifyUsersJob: testing is enabled....turn off for production."); } } @@ -76,8 +76,8 @@ public class OseeNotifyUsersJob extends Job { monitor.done(); return Status.OK_STATUS; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, -1, ex.getMessage(), ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java index 5732b7bfbea..17f676540c4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AbstractItemSelectPanel.java @@ -22,7 +22,7 @@ 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.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -91,7 +91,7 @@ public abstract class AbstractItemSelectPanel<T> { try { createDialog(); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java index 155d1a7b02a..9f353895631 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactSelectPanel.java @@ -20,8 +20,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.dialogs.ArtifactSelectionDialog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.ISelectionStatusValidator; @@ -81,9 +81,9 @@ public class ArtifactSelectPanel extends AbstractItemSelectPanel<Artifact> { public IStatus validate(Object[] selection) { IStatus status; if (selection == null || selection.length != 1) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, IStatus.ERROR, "Must select 1 item", null); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, "Must select 1 item", null); } else { - status = new Status(IStatus.OK, SkynetGuiPlugin.PLUGIN_ID, 0, "", null); + status = new Status(IStatus.OK, Activator.PLUGIN_ID, 0, "", null); } return status; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java index 4dc5560d123..9b36112d492 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/ArtifactTypeSelectPanel.java @@ -18,7 +18,7 @@ import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.osee.framework.core.data.IArtifactType; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeLabelProvider; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactTypeFilteredTreeDialog; import org.eclipse.swt.widgets.Shell; @@ -66,7 +66,7 @@ public class ArtifactTypeSelectPanel extends AbstractItemSelectPanel<IArtifactTy dialog.setInput(artifactTypes); } catch (Exception ex) { ErrorDialog.openError(shell, title, null, // no special message - new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, 0, "Unable to create artifact type selectiong dialog", + new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "Unable to create artifact type selectiong dialog", ex)); } return dialog; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java index 8aea0b3e2d2..fdeb2bb3980 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/AuthenticationComposite.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.OseeCredential; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -281,7 +281,7 @@ public class AuthenticationComposite extends Composite { }); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } if (ClientSessionManager.isSessionValid()) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java index 1d9a291069d..f4d481400b4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/BranchSelectSimpleComposite.java @@ -21,8 +21,8 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; @@ -120,7 +120,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener { try { toReturn = BranchManager.getBranch(branchName); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -216,7 +216,7 @@ public class BranchSelectSimpleComposite extends Composite implements Listener { } } } catch (Exception ex) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.logf(Activator.class, Level.SEVERE, "Unable to add invalid branch id [%s] to selection list.", toStore); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java index 6eb36f7a0b6..dedd4dbc8b8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/panels/DetailsBrowserComposite.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.internal.Activator; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.ToolBar; @@ -42,7 +42,7 @@ public class DetailsBrowserComposite extends BrowserComposite { addData(sb, "Last Modified", String.valueOf(artifact.getLastModified())); addData(sb, "Last Modified By", String.valueOf(artifact.getLastModifiedBy())); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); sb.append(AHTML.getLabelStr("Exception in rendering details: ", ex.getLocalizedMessage())); } setHtml(AHTML.simplePage(sb.toString())); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java index 53ab363b094..01f002bb0c1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.data.OseeCodeVersion; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; @@ -70,7 +70,7 @@ public class ArbitrationServerPage extends PreferencePage implements IWorkbenchP try { defaultApplicationServer = HttpUrlBuilderClient.getInstance().getApplicationServerPrefix(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } List<Data> entries = new ArrayList<Data>(); @@ -97,7 +97,7 @@ public class ArbitrationServerPage extends PreferencePage implements IWorkbenchP @Override public void init(IWorkbench workbench) { - setPreferenceStore(SkynetGuiPlugin.getInstance().getPreferenceStore()); + setPreferenceStore(Activator.getInstance().getPreferenceStore()); setDescription("See default Arbitration Server below."); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java index 153d530f7b9..ad5ead2025d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ConfigurationDetails.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.IHealthStatus; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; @@ -55,7 +55,7 @@ public class ConfigurationDetails extends PreferencePage implements IWorkbenchPr @Override public void init(IWorkbench workbench) { - setPreferenceStore(SkynetGuiPlugin.getInstance().getPreferenceStore()); + setPreferenceStore(Activator.getInstance().getPreferenceStore()); setDescription("See below for OSEE configuration details."); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java index e46921eb65c..c9623e9b30c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/DataSourceDetails.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.database.core.OseeInfo; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; @@ -53,7 +53,7 @@ public class DataSourceDetails extends PreferencePage implements IWorkbenchPrefe @Override public void init(IWorkbench workbench) { - setPreferenceStore(SkynetGuiPlugin.getInstance().getPreferenceStore()); + setPreferenceStore(Activator.getInstance().getPreferenceStore()); setDescription("See below for OSEE Data Source Details."); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java index 3b23141cb01..e6275147a18 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/EditorsPreferencePage.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.SystemGroup; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -56,7 +56,7 @@ public class EditorsPreferencePage extends PreferencePage implements IWorkbenchP try { artifactEditButton.setSelection(UserManager.getBooleanSetting(UserManager.DOUBLE_CLICK_SETTING_KEY)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } closeChangeReportEditorsOnShutdown = new Button(composite, SWT.CHECK); @@ -66,7 +66,7 @@ public class EditorsPreferencePage extends PreferencePage implements IWorkbenchP boolean value = UserManager.getBooleanSetting(CHANGE_REPORT_CLOSE_CHANGE_REPORT_EDITORS_ON_SHUTDOWN); closeChangeReportEditorsOnShutdown.setSelection(value); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } try { @@ -78,11 +78,11 @@ public class EditorsPreferencePage extends PreferencePage implements IWorkbenchP boolean value = UserManager.getBooleanSetting(ADMIN_INCLUDE_ATTRIBUTE_TAB_ON_ARTIFACT_EDITOR); includeAttributeTabOnArtifactEditor.setSelection(value); } 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); } return composite; @@ -121,7 +121,7 @@ public class EditorsPreferencePage extends PreferencePage implements IWorkbenchP UserManager.getUser().persist(getClass().getSimpleName()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return super.performOk(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java index 5490c9c41e2..86407830cb2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/MsWordPreferencePage.java @@ -15,7 +15,7 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; @@ -52,7 +52,7 @@ public class MsWordPreferencePage extends PreferencePage implements IWorkbenchPr try { return UserManager.getBooleanSetting(settingKey); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return false; } } @@ -61,7 +61,7 @@ public class MsWordPreferencePage extends PreferencePage implements IWorkbenchPr try { UserManager.setSetting(settingKey, String.valueOf(button.getSelection())); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -80,7 +80,7 @@ public class MsWordPreferencePage extends PreferencePage implements IWorkbenchPr try { UserManager.getUser().persist(getClass().getSimpleName()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return super.performOk(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java index 42614d671cc..d3def694a00 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSideSorter; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.ControlEvent; @@ -295,7 +295,7 @@ public class RelationExplorerWindow { urls.get(names.indexOf(model.getName()))); artifact.persist(getClass().getSimpleName()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } else { @@ -306,7 +306,7 @@ public class RelationExplorerWindow { try { relationGroup.getArtifact().addRelation(relationGroup, artifact); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -315,7 +315,7 @@ public class RelationExplorerWindow { try { relationGroup.getArtifact().persist(getClass().getSimpleName()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } shell.dispose(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java index 3ebd6875e23..0acd071a821 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java @@ -27,7 +27,7 @@ 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.ArtifactTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -62,7 +62,7 @@ public class RelationTableViewer { try { fullDescriptorList = new ArrayList<ArtifactType>(ArtifactTypeManager.getValidArtifactTypes(branch)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } this.validTable = validTable; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java index 60fc8b9e783..d05d5d5e2b4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/ArtifactFileMonitor.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.jdk.core.util.io.FileWatcher; import org.eclipse.osee.framework.jdk.core.util.io.IFileWatcherListener; 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.internal.Activator; final class ArtifactFileMonitor implements IFileWatcherListener { private final ResourceAttributes readonlyfileAttributes; @@ -79,7 +79,7 @@ final class ArtifactFileMonitor implements IFileWatcherListener { @Override public void done(IJobChangeEvent event) { if (event.getResult().isOK()) { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Updated artifact linked to: " + file.getAbsolutePath()); + OseeLog.log(Activator.class, Level.INFO, "Updated artifact linked to: " + file.getAbsolutePath()); } } }); @@ -87,6 +87,6 @@ final class ArtifactFileMonitor implements IFileWatcherListener { @Override public void handleException(Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java index 8013041e6b1..eb3650149ac 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DefaultArtifactRenderer.java @@ -40,11 +40,11 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditorInput; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.compare.DefaultArtifactCompare; import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator; import org.eclipse.osee.framework.ui.skynet.render.word.AttributeElement; @@ -158,7 +158,7 @@ public class DefaultArtifactRenderer implements IRenderer { StringBuilder builder = new StringBuilder(); ArtifactGuidToWordML guidResolver = new ArtifactGuidToWordML(new OseeLinkBuilder()); RelationOrderRenderer renderer = - new RelationOrderRenderer(SkynetGuiPlugin.getInstance().getOseeCacheService().getRelationTypeCache(), + new RelationOrderRenderer(Activator.getInstance().getOseeCacheService().getRelationTypeCache(), guidResolver, RelationManager.getSorterProvider()); WordMLProducer producer = new WordMLProducer(builder); @@ -243,7 +243,7 @@ public class DefaultArtifactRenderer implements IRenderer { try { HistoryView.open(artifact); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } else if (isRenderOption(OPEN_IN_EXPLORER)) { @@ -258,7 +258,7 @@ public class DefaultArtifactRenderer implements IRenderer { AWorkbench.getActivePage().openEditor(new ArtifactEditorInput(artifact), ArtifactEditor.EDITOR_ID); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -270,7 +270,7 @@ public class DefaultArtifactRenderer implements IRenderer { try { result = getBooleanOption(value); } catch (OseeArgumentException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return result; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DiffUsingRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DiffUsingRenderer.java index 160ce696cb9..1744ab833aa 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DiffUsingRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/DiffUsingRenderer.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.compare.CompareDataCollector; import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator; @@ -32,7 +32,7 @@ public final class DiffUsingRenderer extends AbstractOperation { private final CompareDataCollector collector; public DiffUsingRenderer(CompareDataCollector collector, Collection<ArtifactDelta> artifactDeltas, String pathPrefix, Object... options) { - super(generateOperationName(artifactDeltas), SkynetGuiPlugin.PLUGIN_ID); + super(generateOperationName(artifactDeltas), Activator.PLUGIN_ID); this.artifactDeltas = artifactDeltas; this.pathPrefix = pathPrefix; this.options = options; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java index 293dbb6287c..8f8658f476c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/FileSystemRenderer.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.AIFile; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.program.Program; import org.eclipse.ui.IEditorDescriptor; import org.eclipse.ui.IWorkbench; @@ -104,7 +104,7 @@ public abstract class FileSystemRenderer extends DefaultArtifactRenderer { Program program = getAssociatedProgram(firstArtifact); program.execute(file.getLocation().toFile().getAbsolutePath()); } else { - OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, + OseeLog.logf(Activator.class, Level.INFO, "Test - Opening File - [%s]" + file.getLocation().toFile().getAbsolutePath()); } } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java index e6e9b04f8e5..b576e5ff2d0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/NativeRenderer.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.types.IArtifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.program.Program; @@ -64,7 +64,7 @@ public class NativeRenderer extends FileSystemRenderer { try { fileExtension = getAssociatedExtension(artifact, null); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } if (Strings.isValid(fileExtension)) { imageDescriptor = ImageManager.getProgramImageDescriptor(fileExtension); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenUsingRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenUsingRenderer.java index 3b8c5107ad0..9aa9b9e313f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenUsingRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/OpenUsingRenderer.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Ryan D. Brooks @@ -29,7 +29,7 @@ public final class OpenUsingRenderer extends AbstractOperation { private String resutPath; public OpenUsingRenderer(Collection<Artifact> artifacts, PresentationType presentationType, Object... options) { - super(String.format("Open for %s using renderer", presentationType), SkynetGuiPlugin.PLUGIN_ID); + super(String.format("Open for %s using renderer", presentationType), Activator.PLUGIN_ID); this.artifacts = artifacts; this.options = options; this.presentationType = presentationType; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java index 0358906039e..62a9996bf25 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RelationOrderRenderer.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.relation.order.IRelationSorter; import org.eclipse.osee.framework.skynet.core.relation.order.RelationOrderData; import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.word.Producer; import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer; @@ -48,7 +48,7 @@ public class RelationOrderRenderer { IRelationSorter sorter = sorterProvider.getRelationOrder(toReturn); toReturn = sorter.getSorterId().getName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return toReturn; } @@ -93,13 +93,13 @@ public class RelationOrderRenderer { try { writeTableRow(writer, relationType, side, resolveSorter(sorterGuid), mlLinks); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } writer.endTable(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java index 80e9bc738ea..cef3429a701 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RendererManager.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.compare.CompareDataCollector; import org.eclipse.osee.framework.ui.skynet.render.compare.IComparator; import org.eclipse.osee.framework.ui.skynet.render.compare.NoOpCompareDataCollector; @@ -92,7 +92,7 @@ public final class RendererManager { private static void registerRendersFromExtensionPoints() { ExtensionDefinedObjects<IRenderer> contributions = - new ExtensionDefinedObjects<IRenderer>(SkynetGuiPlugin.PLUGIN_ID + ".ArtifactRenderer", "Renderer", + new ExtensionDefinedObjects<IRenderer>(Activator.PLUGIN_ID + ".ArtifactRenderer", "Renderer", "classname"); for (IRenderer renderer : contributions.getObjects()) { renderers.add(renderer); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java index da65b2a99f1..1dbbfadbe26 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/RenderingUtil.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.skynet.core.change.Change; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; public final class RenderingUtil { @@ -97,7 +97,7 @@ public final class RenderingUtil { showAgain = false; } //log the warning every time - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, warningMessage); + OseeLog.log(Activator.class, Level.WARNING, warningMessage); withinLimit = false; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java index d01670e7e77..40507ff1b86 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/UpdateArtifactOperation.java @@ -39,7 +39,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.linking.LinkType; import org.eclipse.osee.framework.skynet.core.linking.WordMlLinkHandler; import org.eclipse.osee.framework.skynet.core.word.WordUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.preferences.MsWordPreferencePage; import org.eclipse.osee.framework.ui.skynet.render.artifactElement.IElementExtractor; import org.eclipse.osee.framework.ui.skynet.render.artifactElement.MergeEditArtifactElementExtractor; @@ -61,7 +61,7 @@ public class UpdateArtifactOperation extends AbstractOperation { private final boolean threeWayMerge; public UpdateArtifactOperation(File workingFile, List<Artifact> artifacts, Branch branch, boolean threeWayMerge) { - super("Update Artifact", SkynetGuiPlugin.PLUGIN_ID); + super("Update Artifact", Activator.PLUGIN_ID); this.workingFile = workingFile; this.artifacts = artifacts; this.branch = branch; @@ -158,7 +158,7 @@ public class UpdateArtifactOperation extends AbstractOperation { } private void logUpdateSkip(Artifact artifact) { - OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, + OseeLog.logf(Activator.class, Level.INFO, "Skipping update - artifact [%s] is read-only", artifact.toString()); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeAttributeUpdateOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeAttributeUpdateOperation.java index 48bf1d547b2..ad8ce389141 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeAttributeUpdateOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WholeAttributeUpdateOperation.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Ryan D. Brooks @@ -30,7 +30,7 @@ public class WholeAttributeUpdateOperation extends AbstractOperation { private final File file; public WholeAttributeUpdateOperation(File file, Artifact artifact, IAttributeType attributeType) { - super("Native Artifact Update", SkynetGuiPlugin.PLUGIN_ID); + super("Native Artifact Update", Activator.PLUGIN_ID); this.artifact = artifact; this.attributeType = attributeType; this.file = file; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java index b0c1bbb3cc4..231faee2fdc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordImageChecker.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.imageDetection.WordImageCompare; /** @@ -41,7 +41,7 @@ public class WordImageChecker { try { downArrow = new String(new byte[] {(byte) 0xE2, (byte) 0x86, (byte) 0x93}, "UTF-8"); } catch (UnsupportedEncodingException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } String MODIFIED_STRING = "<w:t>" + downArrow + " OSEE Detected Image Modification " + downArrow + "</w:t></w:r></w:p><w:p><w:r></w:r></w:p><w:p><w:r>"; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java index e42738c7fce..0d75b3a46d4 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/compare/WordTemplateCompare.java @@ -23,7 +23,7 @@ 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.change.ArtifactDelta; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.FileSystemRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; @@ -77,7 +77,7 @@ public class WordTemplateCompare extends AbstractWordCompare { try { addToCompare(monitor, data, PresentationType.DIFF, artifactDelta); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } finally { monitor.worked(1); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java index 6900ae3628f..476c15e6549 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/AttributeElement.java @@ -15,7 +15,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.word.WordUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -54,7 +54,7 @@ public class AttributeElement { } else if (elementType.equals("Format")) { format = value; } else { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Unexpected element read in Attribute:" + elementType); + OseeLog.log(Activator.class, Level.WARNING, "Unexpected element read in Attribute:" + elementType); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java index 7665017f5c8..5e2e1f36e84 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordMLProducer.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.jdk.core.util.xml.Xml; 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.internal.Activator; /** * @author Ryan D. Brooks @@ -85,7 +85,7 @@ public class WordMLProducer extends Producer { } else { flattenedLevelCount++; endOutlineSubSection(true); - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Outline level flattened, outline can only go 9 levels deep"); + OseeLog.log(Activator.class, Level.WARNING, "Outline level flattened, outline can only go 9 levels deep"); return startOutlineSubSection(font, headingText, outlineType); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java index 7c8b44a8415..a9fb615cc49 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/word/WordTemplateFileDiffer.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.DefaultArtifactRenderer; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; @@ -77,7 +77,7 @@ public final class WordTemplateFileDiffer { diff(isDiffFromBaseline, txDelta, startBranch, ArtifactCache.getActive(artifact.getArtId(), artifact.getBranch()), diffPrefix); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java index 42798e877be..37dda361ed5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java @@ -22,8 +22,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.IActionable; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.html.ResultsEditorHtmlTab; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; import org.eclipse.osee.framework.ui.swt.ALayout; @@ -68,7 +68,7 @@ public class ResultsEditor extends AbstractArtifactEditor implements IActionable setPartName(provider.getEditorName()); setActivePage(startPage); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -188,7 +188,7 @@ public class ResultsEditor extends AbstractArtifactEditor implements IActionable // } page.openEditor(input, EDITOR_ID); } catch (PartInitException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }, forcePend); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorInput.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorInput.java index 7aa2d7a57cb..bb3ede42128 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorInput.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditorInput.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.jface.resource.ImageDescriptor; 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.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; @@ -72,7 +72,7 @@ public class ResultsEditorInput implements IEditorInput { try { return iresultsEditorProvider.getEditorName(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return "Exception getting name: " + ex.getLocalizedMessage(); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java index 21c51ef21c1..2031ac1403a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataLoggerListener.java @@ -14,7 +14,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.core.util.IResultDataListener; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * Added to XResultData if desire results to be OseeLog @@ -25,7 +25,7 @@ public class XResultDataLoggerListener implements IResultDataListener { @Override public void log(final XResultData.Type type, final String str) { - OseeLog.log(SkynetGuiPlugin.class, Level.parse(type.name().toUpperCase()), str); + OseeLog.log(Activator.class, Level.parse(type.name().toUpperCase()), str); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java index aa3797bc685..96bf1001d7d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/XResultDataUI.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.html.XResultBrowserHyperCmd; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; @@ -140,7 +140,7 @@ public class XResultDataUI { rd.addRaw(AHTML.endMultiColumnTable()); report(rd, "This is my report title"); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/results/chart/ChartViewerSWT.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/chart/ChartViewerSWT.java index 92f818b51e0..bdcf0ed36a7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/chart/ChartViewerSWT.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/chart/ChartViewerSWT.java @@ -19,7 +19,7 @@ import org.eclipse.birt.chart.model.attribute.Bounds; import org.eclipse.birt.chart.model.attribute.impl.BoundsImpl; import org.eclipse.birt.chart.util.PluginSettings; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.graphics.Rectangle; @@ -39,7 +39,7 @@ public class ChartViewerSWT implements PaintListener try { idr = ps.getDevice("dv.SWT"); } catch (ChartException pex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, pex); + OseeLog.log(Activator.class, Level.SEVERE, pex); } } @@ -61,7 +61,7 @@ public class ChartViewerSWT implements PaintListener try { gr.render(idr, gr.build(idr.getDisplayServer(), chart, null, bo, null)); } catch (ChartException gex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, gex); + OseeLog.log(Activator.class, Level.SEVERE, gex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java index a4de0f38218..ea8cb866087 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java @@ -23,9 +23,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.action.browser.BrowserPrintAction; import org.eclipse.osee.framework.ui.skynet.action.browser.IBrowserActionHandler; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs; @@ -163,7 +163,7 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab, IBrowserActi resultsEditor.addResultsTab(new ResultsEditorHtmlTab(new XResultPage(filename, html, Manipulations.RAW_HTML))); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java index 881896d11ae..2e7af4de8e5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultBrowserListener.java @@ -19,9 +19,9 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor; import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.widgets.xBranch.BranchView; @@ -68,7 +68,7 @@ public class XResultBrowserListener implements LocationListener { RendererManager.openInJob(artifact, PresentationType.DEFAULT_OPEN); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } break; @@ -89,7 +89,7 @@ public class XResultBrowserListener implements LocationListener { IWebBrowser browser = browserSupport.createBrowser("osee.ats.navigator.browser"); browser.openURL(new URL(value)); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } break; case browserExternal: @@ -100,7 +100,7 @@ public class XResultBrowserListener implements LocationListener { break; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Can't process hyperlink.", ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Can't process hyperlink.", ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java index e8390f76cb5..d41fc81e64e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultPage.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Lib; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs; import org.eclipse.swt.program.Program; @@ -263,7 +263,7 @@ public class XResultPage { try { Lib.writeStringToFile(manipulatedHtml, new File(filename)); } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Program.launch(filename); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java index f508555db9a..07648094d3b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/XResultsComposite.java @@ -20,7 +20,7 @@ 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.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs; import org.eclipse.swt.SWT; @@ -81,7 +81,7 @@ public class XResultsComposite extends Composite { try { Lib.writeStringToFile(htmlText, new File(fileName)); } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Program.launch(fileName); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java index fb13318a9bb..7be83a821f2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/table/ResultsEditorTableTab.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.core.util.TableWriterAdaptor; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.OseeData; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.table.xresults.ResultsXViewer; import org.eclipse.osee.framework.ui.skynet.results.table.xresults.ResultsXViewerContentProvider; @@ -133,7 +133,7 @@ public class ResultsEditorTableTab implements IResultsEditorTableTab { try { new HtmlExportTable(tabName, new XViewerTreeReport(resultsXViewer).getHtml(), true).exportCsv(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -147,7 +147,7 @@ public class ResultsEditorTableTab implements IResultsEditorTableTab { try { new HtmlExportTable(tabName, new XViewerTreeReport(resultsXViewer).getHtml(), true).exportTsv(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -190,7 +190,7 @@ public class ResultsEditorTableTab implements IResultsEditorTableTab { writerAdaptor.close(); Program.launch(TableResultsFile.getAbsolutePath()); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java index 12da7345ac8..4bad68efb6a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/revert/RevertContentProvider.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactContentProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.widgets.Combo; /** @@ -58,7 +58,7 @@ public class RevertContentProvider extends ArtifactContentProvider { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (parentElement instanceof Collection) { return ((Collection<?>) parentElement).toArray(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index 09d63902a61..d30ad336dae 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -42,7 +42,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModel; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModelList; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterTableViewer; @@ -149,7 +149,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl branch = BranchManager.getCommonBranch(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return branch; } @@ -190,7 +190,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl artifactTypeList.setData(descriptor.getName(), descriptor); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error encountered while getting list of artifact types", ex); } addToSearchTypeList(new ArtifactTypeFilter(artifactTypeControls, artifactTypeList)); @@ -226,7 +226,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl relationTypeList.setData(linkDescriptor.getName(), linkDescriptor); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } relationTypeList.getCombo().addSelectionListener(new SelectionAdapter() { @@ -304,7 +304,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl attributeTypeList.setData(type.getName(), type); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error encountered while getting list of attribute types", ex); } attributeTypeList.getCombo().setVisibleItemCount(Math.min(attributeTypeList.getCombo().getItemCount(), 15)); @@ -539,7 +539,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl } protected void saveState() { - IDialogSettings dialogSettings = SkynetGuiPlugin.getInstance().getDialogSettings(); + IDialogSettings dialogSettings = Activator.getInstance().getDialogSettings(); if (dialogSettings != null) { List<String> filterString = new ArrayList<String>(); @@ -547,15 +547,15 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl for (FilterModel model : filterList.getFilters()) { filterString.add(asString(model)); } - dialogSettings.put(SkynetGuiPlugin.PLUGIN_ID + FILTERS_STORAGE_KEY, + dialogSettings.put(Activator.PLUGIN_ID + FILTERS_STORAGE_KEY, filterString.toArray(new String[filterString.size()])); } } protected void loadState() { - IDialogSettings dialogSettings = SkynetGuiPlugin.getInstance().getDialogSettings(); + IDialogSettings dialogSettings = Activator.getInstance().getDialogSettings(); if (dialogSettings != null) { - String[] filters = dialogSettings.getArray(SkynetGuiPlugin.PLUGIN_ID + FILTERS_STORAGE_KEY); + String[] filters = dialogSettings.getArray(Activator.PLUGIN_ID + FILTERS_STORAGE_KEY); if (filters != null) { for (String entry : filters) { processStoredFilter(entry); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java index 01ca39b778b..9e8bed4eac1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AttributeFindReplaceDialog.java @@ -39,7 +39,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -106,7 +106,7 @@ public class AttributeFindReplaceDialog extends Dialog { cmbAttributeDescriptors.getCombo().select(0); } catch (OseeCoreException ex) { cmbAttributeDescriptors.setInput(new Object[] {ex}); - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -188,7 +188,7 @@ public class AttributeFindReplaceDialog extends Dialog { if (ex.getMessage().equals("USER_PURPLE CANCELLED")) { toReturn = Status.CANCEL_STATUS; } else { - toReturn = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, IStatus.OK, ex.getMessage(), ex); + toReturn = new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.OK, ex.getMessage(), ex); } } finally { monitor.done(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java index 16b0b25e725..bac26fda2ad 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/InRelationFilter.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive; import org.eclipse.osee.framework.skynet.core.artifact.search.InRelationSearch; import org.eclipse.osee.framework.skynet.core.artifact.search.NotSearch; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterTableViewer; import org.eclipse.swt.widgets.Control; @@ -49,7 +49,7 @@ public class InRelationFilter extends SearchFilter { filterViewer.addItem(primitive, getFilterName(), type, sideName); } catch (OseeArgumentException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java index edda38f7e7c..0dac5770f59 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive; import org.eclipse.osee.framework.skynet.core.artifact.search.NotSearch; import org.eclipse.osee.framework.skynet.core.artifact.search.OrphanArtifactSearch; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterTableViewer; import org.eclipse.swt.widgets.Control; @@ -48,7 +48,7 @@ public class OrphanSearchFilter extends SearchFilter { filterViewer.addItem(primitive, getFilterName(), typeName, ""); } } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java index d55ea4e980d..90a75ed191c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchOptionComposite.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.plugin.util.HelpContext; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.AttributeTypeFilteredCheckTreeDialog; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.HidingComposite; @@ -483,7 +483,7 @@ public class QuickSearchOptionComposite extends Composite { } Collections.sort(configuration, attrTypeComparator); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -513,7 +513,7 @@ public class QuickSearchOptionComposite extends Composite { AttributeType type = AttributeTypeManager.getTypeByGuid(entry); configuration.add(type); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -531,7 +531,7 @@ public class QuickSearchOptionComposite extends Composite { return "All"; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return StringUtils.join(configuration, ", "); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java index d0a0353072c..30da9a68b3b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/RemoteArtifactSearch.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactMatch; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.page.AttributeLineElement; import org.eclipse.osee.framework.ui.skynet.search.page.AttributeMatch; import org.eclipse.search.ui.NewSearchUI; @@ -112,7 +112,7 @@ final class RemoteArtifactSearch extends AbstractArtifactSearchQuery { resultCollector.acceptArtifactMatch(artifactMatch); } } catch (OseeCoreException ex) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error processing attribute line matches for [%s]", artifactMatch.getArtifact()); resultCollector.acceptArtifactMatch(artifactMatch); } @@ -125,7 +125,7 @@ final class RemoteArtifactSearch extends AbstractArtifactSearchQuery { } catch (Exception ex) { OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex); } finally { - OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, + OseeLog.logf(Activator.class, Level.INFO, "Quick Search: [%s] artifacts with [%s] location matches loaded in [%s secs] collected in [%s]", artifactCount, lineMatches, (endOfloadTime - startTime) / 1000.0, Lib.getElapseString(startCollectTime)); } @@ -229,7 +229,7 @@ final class RemoteArtifactSearch extends AbstractArtifactSearchQuery { return attribute.getDisplayableString(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return ""; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java index 5302e98d490..b7501a1f545 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchLabelProvider.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.ui.skynet.ArtifactDecorator; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.IArtifactDecoratorPreferences; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.AbstractArtifactSearchResult; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.search.ui.text.Match; @@ -126,7 +126,7 @@ public class ArtifactSearchLabelProvider extends LabelProvider implements IStyle coloredName.append(' ').append(selectedAttributes, StyledString.DECORATIONS_STYLER); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); coloredName.append(' ').append(ex.getLocalizedMessage()); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java index cae0501f60d..4f0ba862437 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactSearchPage.java @@ -47,7 +47,7 @@ import org.eclipse.osee.framework.skynet.core.event.model.Sender; import org.eclipse.osee.framework.ui.skynet.ArtifactDecorator; import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener; import org.eclipse.osee.framework.ui.skynet.search.AbstractArtifactSearchResult; import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; @@ -126,7 +126,7 @@ public class ArtifactSearchPage extends AbstractArtifactSearchViewPage implement private IArtifactSearchContentProvider fContentProvider; private ISelectionProvider selectionProvider; private final ArtifactDecorator artifactDecorator = new ArtifactDecorator( - SkynetGuiPlugin.ARTIFACT_SEARCH_RESULTS_ATTRIBUTES_PREF); + Activator.ARTIFACT_SEARCH_RESULTS_ATTRIBUTES_PREF); public ArtifactSearchPage() { setElementLimit(new Integer(DEFAULT_ELEMENT_LIMIT)); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java index 48b834de7a9..628b6affb41 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/page/ArtifactTreeContentProvider.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.search.AbstractArtifactSearchResult; import org.eclipse.search.ui.text.Match; @@ -240,7 +240,7 @@ public class ArtifactTreeContentProvider implements ITreeContentProvider, IArtif try { return resource.getParent(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java index 0ccb98fe261..d9f6066cd41 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphContentProvider.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationManager; import org.eclipse.osee.framework.skynet.core.types.IArtifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.zest.core.viewers.IGraphEntityContentProvider; /** @@ -83,7 +83,7 @@ public class ArtifactGraphContentProvider implements IGraphEntityContentProvider } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return otherItems.toArray(); } @@ -145,7 +145,7 @@ public class ArtifactGraphContentProvider implements IGraphEntityContentProvider } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java index c5d86bf8d4f..9aba805b1eb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/ArtifactGraphLabelProvider.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.skywalker.SkyWalkerOptions.LinkName; import org.eclipse.swt.graphics.Image; import org.eclipse.zest.core.viewers.EntityConnectionData; @@ -94,7 +94,7 @@ public class ArtifactGraphLabelProvider implements ILabelProvider { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return ex.getLocalizedMessage(); } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java index 328ff40b97a..01ecc6aa831 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerOptions.java @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.skywalker.ISkyWalkerOptionsChangeListener.ModType; import org.eclipse.zest.layouts.LayoutStyles; import org.eclipse.zest.layouts.algorithms.AbstractLayoutAlgorithm; @@ -106,7 +106,7 @@ public final class SkyWalkerOptions { artTypes.put(descriptor, true); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -119,7 +119,7 @@ public final class SkyWalkerOptions { showAttributes.put(descriptor, false); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -134,7 +134,7 @@ public final class SkyWalkerOptions { relTypes.put(new RelationTypeSide(relationType, RelationSide.SIDE_B), true); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -167,7 +167,7 @@ public final class SkyWalkerOptions { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "SkyWalker couldn't find stored artifact via guid", ex); + OseeLog.log(Activator.class, Level.WARNING, "SkyWalker couldn't find stored artifact via guid", ex); } String artTypeStr = AXml.getTagData(xml, "artTypes"); if (Strings.isValid(artTypeStr)) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java index 735d7f79870..417ef791e50 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/SkyWalkerView.java @@ -39,7 +39,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.ArtifactDoubleClick; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ImageCapture; import org.eclipse.osee.framework.ui.skynet.widgets.GenericViewPart; import org.eclipse.osee.framework.ui.swt.Displays; @@ -161,7 +161,7 @@ public class SkyWalkerView extends GenericViewPart { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } HelpUtil.setHelp(viewer.getControl(), OseeHelpContext.SKY_WALKER_VIEW); @@ -269,7 +269,7 @@ public class SkyWalkerView extends GenericViewPart { Lib.writeStringToFile(options.toXml(), new File(filename)); AWorkbench.popup("Saved", "Save Successful"); } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -284,7 +284,7 @@ public class SkyWalkerView extends GenericViewPart { options.fromXml(xml); explore(options.getArtifact()); } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -371,7 +371,7 @@ public class SkyWalkerView extends GenericViewPart { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Sky Walker error on init: ", ex); + OseeLog.log(Activator.class, Level.WARNING, "Sky Walker error on init: ", ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java index 140bc70b5de..ab082182071 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeContentProvider.java @@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.zest.core.viewers.IGraphEntityContentProvider; /** @@ -38,7 +38,7 @@ public class ArtifactTypeContentProvider implements IGraphEntityContentProvider return ((ArtifactType) entity).getFirstLevelDescendantTypes().toArray(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return null; } @@ -53,7 +53,7 @@ public class ArtifactTypeContentProvider implements IGraphEntityContentProvider return artifactTypes.toArray(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return null; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java index ff95cf894a1..77561f23a35 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/skywalker/arttype/ArtifactTypeWalker.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeLabelProvider; import org.eclipse.osee.framework.ui.skynet.widgets.GenericViewPart; import org.eclipse.osee.framework.ui.swt.Displays; @@ -73,7 +73,7 @@ public class ArtifactTypeWalker extends GenericViewPart { try { explore(ArtifactTypeManager.getType((IArtifactType) obj)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -104,7 +104,7 @@ public class ArtifactTypeWalker extends GenericViewPart { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } setPartName("Artifact Type Walker (" + artifactType.getName() + ")"); } @@ -131,7 +131,7 @@ public class ArtifactTypeWalker extends GenericViewPart { try { explore(ArtifactTypeManager.getType(CoreArtifactTypes.Artifact)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java index 437d1222236..2d2b30b8746 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/ArtifactTemplateProvider.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Attribute; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.IRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; @@ -59,7 +59,7 @@ public class ArtifactTemplateProvider implements ITemplateProvider { templateMap.put(matchCriteria, art); } OseeLog.logf( - SkynetGuiPlugin.class, + Activator.class, Level.SEVERE, "ArtifactTemplateProvider has detected a conflict with 'Template Match Criteria' [%s]. Artifact [%s] will supply the template for all requests with this match criteria.", diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java index f4068107f7f..486c8b54b3a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/templates/TemplateManager.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.IRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; @@ -60,7 +60,7 @@ public class TemplateManager { } Collections.sort(templates); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return templates; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/OpenUsersInMassEditor.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/OpenUsersInMassEditor.java index d70b5283220..833ed22dc0a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/OpenUsersInMassEditor.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/OpenUsersInMassEditor.java @@ -18,8 +18,8 @@ import org.eclipse.osee.framework.plugin.core.util.IExceptionableRunnable; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class OpenUsersInMassEditor extends Action { @@ -41,12 +41,12 @@ public class OpenUsersInMassEditor extends Action { MassArtifactEditor.editArtifacts(active == Active.Active ? "Active Users" : "All Users", users); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, ex.getLocalizedMessage(), ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getLocalizedMessage(), ex); } return Status.OK_STATUS; } }; - Jobs.runInJob(getText(), runnable, SkynetGuiPlugin.class, SkynetGuiPlugin.PLUGIN_ID); + Jobs.runInJob(getText(), runnable, Activator.class, Activator.PLUGIN_ID); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java index 83316335aec..87ee700b31e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateView.java @@ -39,9 +39,9 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.IXNavigateEventListener; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.action.CollapseAllAction; import org.eclipse.osee.framework.ui.skynet.action.ExpandAllAction; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite; import org.eclipse.osee.framework.ui.skynet.util.LoadingComposite; import org.eclipse.osee.framework.ui.swt.Displays; @@ -89,7 +89,7 @@ public class UserNavigateView extends ViewPart implements IActionable, IXNavigat public void refreshData() { List<IOperation> ops = new ArrayList<IOperation>(); ops.add(new UserNavigateViewItemsOperation()); - IOperation operation = new CompositeOperation("Load User Navigator", SkynetGuiPlugin.PLUGIN_ID, ops); + IOperation operation = new CompositeOperation("Load User Navigator", Activator.PLUGIN_ID, ops); Operations.executeAsJob(operation, false, Job.LONG, new ReloadJobChangeAdapter(this)); } @@ -114,7 +114,7 @@ public class UserNavigateView extends ViewPart implements IActionable, IXNavigat } if (!DbConnectionExceptionComposite.dbConnectionIsOk(parent)) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Navigate View - !dbConnectionIsOk"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Navigate View - !dbConnectionIsOk"); } xNavComp = new XNavigateComposite(UserNavigateViewItems.getInstance(), parent, SWT.NONE); @@ -153,7 +153,7 @@ public class UserNavigateView extends ViewPart implements IActionable, IXNavigat addExtensionPointListenerBecauseOfWorkspaceLoading(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return Status.OK_STATUS; } @@ -193,7 +193,7 @@ public class UserNavigateView extends ViewPart implements IActionable, IXNavigat return String.format("%s - %s:%s", userName, ClientSessionManager.getDataStoreName(), ClientSessionManager.getDataStoreLoginName()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return "Exception: " + ex.getLocalizedMessage(); } } @@ -248,7 +248,7 @@ public class UserNavigateView extends ViewPart implements IActionable, IXNavigat } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "NavigateView error on init", ex); + OseeLog.log(Activator.class, Level.WARNING, "NavigateView error on init", ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java index 899580253f9..6aaa449c35d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItems.java @@ -27,10 +27,10 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateViewItems; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.operation.CreateNewUser; import org.eclipse.osee.framework.ui.skynet.blam.operation.PopulateUserGroupBlam; import org.eclipse.osee.framework.ui.skynet.blam.operation.UniqueNumberOfCurrentOseeUsers; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.user.OpenUsersInMassEditor; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemBlam; @@ -62,7 +62,7 @@ public class UserNavigateViewItems implements XNavigateViewItems, IXNavigateComm XNavigateCommonItems.addCommonNavigateItems(items, Arrays.asList(getSectionId())); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } @@ -91,7 +91,7 @@ public class UserNavigateViewItems implements XNavigateViewItems, IXNavigateComm } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -103,7 +103,7 @@ public class UserNavigateViewItems implements XNavigateViewItems, IXNavigateComm addOseePeerSectionChildren(reviewItem); items.add(reviewItem); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Can't create OSEE Review section"); + OseeLog.log(Activator.class, Level.SEVERE, "Can't create OSEE Review section"); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItemsOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItemsOperation.java index 7ba6ec21bb5..722b3b134b7 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItemsOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/user/perspective/UserNavigateViewItemsOperation.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.user.perspective; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.core.operation.AbstractOperation; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; public class UserNavigateViewItemsOperation extends AbstractOperation { public UserNavigateViewItemsOperation() { - super("Loading User Navigate View Items", SkynetGuiPlugin.PLUGIN_ID); + super("Loading User Navigate View Items", Activator.PLUGIN_ID); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java index 71d762e07f5..74bb677660b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/HtmlExportTable.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.program.Program; @@ -119,7 +119,7 @@ public class HtmlExportTable { } return Result.TrueResult; } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } else { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java index 453462456d8..10de638d95a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.core.operation.IOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.styledText.IDictionary; /** @@ -131,19 +131,19 @@ public class OseeDictionary implements IDictionary { private final Collection<IOseeDictionary> toLoad; public LoadDictionaryOperation(Collection<IOseeDictionary> toLoad) { - super("Loading Osee Dictionary", SkynetGuiPlugin.PLUGIN_ID); + super("Loading Osee Dictionary", Activator.PLUGIN_ID); this.toLoad = toLoad; } @Override protected void doWork(IProgressMonitor monitor) throws Exception { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Loading Osee Dictionary"); + OseeLog.log(Activator.class, Level.INFO, "Loading Osee Dictionary"); ExtensionDefinedObjects<IOseeDictionary> contributions = new ExtensionDefinedObjects<IOseeDictionary>("org.eclipse.osee.framework.ui.skynet.OseeDictionary", "OseeDictionary", "classname"); List<IOseeDictionary> dictionaries = contributions.getObjects(); toLoad.addAll(dictionaries); - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Loaded Osee Dictionary"); + OseeLog.log(Activator.class, Level.INFO, "Loaded Osee Dictionary"); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java index 0f2cf59b0e6..2a601e9cd57 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeMainDictionary.java @@ -18,7 +18,7 @@ import java.util.Set; import java.util.logging.Level; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.osgi.framework.Bundle; /** @@ -39,7 +39,7 @@ public class OseeMainDictionary implements IOseeDictionary { // open OSEE english dictionary BufferedReader br = null; try { - Bundle bundle = SkynetGuiPlugin.getInstance().getBundle(); + Bundle bundle = Activator.getInstance().getBundle(); URL url = bundle.getEntry("support/spellCheck/AllWords.txt"); br = new BufferedReader(new InputStreamReader(url.openStream())); @@ -49,7 +49,7 @@ public class OseeMainDictionary implements IOseeDictionary { dictionary.add(line); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } finally { wasLoaded = true; Lib.close(br); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java index aa764938318..c5a6426dea8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java @@ -19,8 +19,8 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; import org.eclipse.osee.framework.ui.skynet.HTMLTransferFormatter; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSource; import org.eclipse.swt.dnd.DragSourceEvent; @@ -117,7 +117,7 @@ public abstract class SkynetDragAndDrop { try { performDragOver(event); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java index ef8eb8b25ae..069c068be7d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetViews.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.core.OseeInfo; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.ui.IMemento; import org.eclipse.ui.IWorkbench; @@ -40,7 +40,7 @@ public class SkynetViews { try { currentDbId = OseeInfo.getDatabaseGuid(); } catch (OseeDataStoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Unable to set memento source db guid"); + OseeLog.log(Activator.class, Level.WARNING, "Unable to set memento source db guid"); } if (dbId.equals(currentDbId)) { result = true; @@ -55,7 +55,7 @@ public class SkynetViews { try { memento.putString(MEMENTO_SOURCE_GUID, OseeInfo.getDatabaseGuid()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Unable to set memento source db guid"); + OseeLog.log(Activator.class, Level.WARNING, "Unable to set memento source db guid"); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java index 5f2f3bdc3c1..2ec250ea1b1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java @@ -25,7 +25,7 @@ import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.jdk.core.util.Lib; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.compare.CompareData; /** @@ -111,7 +111,7 @@ public class VbaWordDiffGenerator implements IVbaDiffGenerator { if (executeVbScript) { executeScript(new File(compareData.getGeneratorScriptPath())); } else { - OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, "Test - Skip launch of [%s]", + OseeLog.logf(Activator.class, Level.INFO, "Test - Skip launch of [%s]", compareData.getGeneratorScriptPath()); } } @@ -159,7 +159,7 @@ public class VbaWordDiffGenerator implements IVbaDiffGenerator { @Override protected void log(String message) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, message); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, message); } }; @@ -167,7 +167,7 @@ public class VbaWordDiffGenerator implements IVbaDiffGenerator { @Override protected void log(String message) { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, message); + OseeLog.log(Activator.class, Level.INFO, message); } }; errorCatcher.start(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java index 1bcaff99276..6e7af1d19de 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/WordUiUtil.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.swt.Displays; @@ -45,7 +45,7 @@ public final class WordUiUtil { if (RenderingUtil.arePopupsAllowed()) { XResultDataUI.report(rd, "Unhandled Artifacts"); } else { - OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, + OseeLog.logf(Activator.class, Level.INFO, "Test - Skip Unhandled Artifacts Report - %s - [%s]", warningString, artifacts); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java index e593d300880..af275ac2f1c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailUserGroups.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLo import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserGroupsCheckTreeDialog; import org.eclipse.swt.program.Program; @@ -75,7 +75,7 @@ public class EmailUserGroups extends XNavigateItemAction { for (Artifact userArt : artifact.getRelatedArtifacts(CoreRelationTypes.Universal_Grouping__Members)) { if (userArt instanceof User) { if (!EmailUtil.isEmailValid((User) userArt)) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, + OseeLog.logf(Activator.class, Level.SEVERE, "Invalid email [%s] for user [%s]; skipping", ((User) userArt).getEmail(), userArt); } else if (((User) userArt).isActive()) { emails.add(((User) userArt).getEmail()); @@ -85,7 +85,7 @@ public class EmailUserGroups extends XNavigateItemAction { } else if (artifact.isOfType(CoreArtifactTypes.UserGroup)) { for (User user : artifact.getRelatedArtifacts(CoreRelationTypes.Users_User, User.class)) { if (!EmailUtil.isEmailValid(user)) { - OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, "Invalid email [%s] for user [%s]; skipping", + OseeLog.logf(Activator.class, Level.SEVERE, "Invalid email [%s] for user [%s]; skipping", user.getEmail(), user); } else if (user.isActive()) { emails.add(user.getEmail()); @@ -107,7 +107,7 @@ public class EmailUserGroups extends XNavigateItemAction { AWorkbench.popup("Complete", "Configured emails openened in local email client."); } } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java index fe479ae5ce3..71c3cd000cd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.skynet.core.utility.EmailUtil; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.OSEEFilteredTree; import org.eclipse.swt.SWT; @@ -106,7 +106,7 @@ public class EmailWizardPage extends WizardPage { names.remove(UserManager.getUser(SystemUser.UnAssigned)); names.remove(UserManager.getUser(SystemUser.OseeSystem)); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); names.add(ex.getLocalizedMessage()); } @@ -254,7 +254,7 @@ public class EmailWizardPage extends WizardPage { bccList.setInput(new Object[] {UserManager.getUser().getEmail()}); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } // Additional Text @@ -285,7 +285,7 @@ public class EmailWizardPage extends WizardPage { return true; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -360,7 +360,7 @@ public class EmailWizardPage extends WizardPage { return ((String) element).toString(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return ""; } @@ -391,7 +391,7 @@ public class EmailWizardPage extends WizardPage { try { return getToAddresses().length > 0 || getCcAddresses().length > 0; } catch (OseeCoreException 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.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java index e9b766e3aa1..e3584f7f6bd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/ArtifactTypeContentProvider.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -34,7 +34,7 @@ public class ArtifactTypeContentProvider implements ITreeContentProvider { try { return ArtifactTypeManager.getValidArtifactTypes((Branch) parentElement).toArray(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java index c49b3dcc981..4165497188a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/AttributeContentProvider.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -40,7 +40,7 @@ public class AttributeContentProvider implements ITreeContentProvider { descriptors.add(descriptor); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return descriptors.toArray(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java index 1707be959ac..e82d2c5e27d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/RelationTypeContentProvider.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.type.RelationType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -40,7 +40,7 @@ public class RelationTypeContentProvider implements ITreeContentProvider { } return descriptors.toArray(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java index 66d816e4a45..312aa620b39 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.IOseeDictionary; import org.eclipse.osee.framework.ui.swt.Displays; @@ -39,7 +39,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, try { return updateArtifact("Global", word, OseeSystemArtifacts.getGlobalPreferenceArtifact()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -49,7 +49,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, try { return updateArtifact("Local", word, UserManager.getUser()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); return false; } } @@ -68,7 +68,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, loadDictionary(true); return true; } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return false; @@ -118,7 +118,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, } } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java index 4ae687c3157..ff91d779d7b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeComboViewer.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -48,7 +48,7 @@ public class XArtifactTypeComboViewer extends XComboViewer { Collections.sort(sortedArtifatTypes); getComboViewer().setInput(sortedArtifatTypes); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } ArrayList<Object> defaultSelection = new ArrayList<Object>(); defaultSelection.add("--select--"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeMultiChoiceSelect.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeMultiChoiceSelect.java index fdcf1113643..6d87bcf721f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeMultiChoiceSelect.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeMultiChoiceSelect.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.MinMaxOSEECheckedFilteredTreeDialog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.SimpleCheckFilteredTreeDialog; @@ -36,7 +36,7 @@ public class XArtifactTypeMultiChoiceSelect extends XSelectFromDialog<ArtifactTy try { setSelectableItems(ArtifactTypeManager.getAllTypes()); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java index 10c1e925726..3fdd9aceb15 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeComboViewer.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -48,7 +48,7 @@ public class XAttributeTypeComboViewer extends XComboViewer { Collections.sort(sortedArtifatTypes); getComboViewer().setInput(sortedArtifatTypes); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } ArrayList<Object> defaultSelection = new ArrayList<Object>(); defaultSelection.add("--select--"); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeMultiChoiceSelect.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeMultiChoiceSelect.java index d2a072d3073..0166dc5f20f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeMultiChoiceSelect.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeMultiChoiceSelect.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.MinMaxOSEECheckedFilteredTreeDialog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.SimpleCheckFilteredTreeDialog; @@ -36,7 +36,7 @@ public class XAttributeTypeMultiChoiceSelect extends XSelectFromDialog<Attribute try { setSelectableItems(AttributeTypeManager.getAllTypes()); } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java index 10d8145ed3a..9363e50d548 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectComboWidget.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.panels.BranchSelectSimpleComposite; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; @@ -106,7 +106,7 @@ public class XBranchSelectComboWidget extends GenericXWidget implements Listener @Override public IStatus isValid() { if (isEmpty()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select a Branch"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must select a Branch"); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java index 84cc1881aa3..173d73b3580 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XBranchSelectWidget.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -110,7 +110,7 @@ public class XBranchSelectWidget extends GenericXWidget implements Listener { @Override public IStatus isValid() { if (isEmpty()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select a Branch"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must select a Branch"); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java index 3f0c2667e9c..58698993159 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java @@ -15,7 +15,7 @@ import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -263,7 +263,7 @@ public class XCombo extends XButtonCommon { @Override public IStatus isValid() { if (isRequiredEntry() && isEmpty()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel() + " must be selected."); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must be selected."); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java index 65ad6100814..fbb57a0479b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class XComboBooleanDam extends XCombo implements IAttributeWidget { @@ -64,7 +64,7 @@ public class XComboBooleanDam extends XCombo implements IAttributeWidget { artifact.setSoleAttributeValue(attributeType, (enteredValue != null && enteredValue.equals("yes"))); } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java index d9c3355f924..07e6656b41f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class XComboDam extends XCombo implements IAttributeWidget { @@ -64,7 +64,7 @@ public class XComboDam extends XCombo implements IAttributeWidget { artifact.setSoleAttributeValue(attributeType, enteredValue); } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java index a7508515a29..08b00beb08a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboViewer.java @@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -246,7 +246,7 @@ public class XComboViewer extends GenericXWidget { } Object selected = getSelected(); if (selected == null && isRequiredEntry()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select " + getLabel()); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must select " + getLabel()); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java index 11b0ead645d..17d600354c5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java @@ -22,7 +22,7 @@ import org.eclipse.nebula.widgets.calendarcombo.CalendarListenerAdapter; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.DateUtil; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyListener; @@ -166,12 +166,12 @@ public class XDate extends XWidget { public IStatus isValid() { if (isRequireFutureDate()) { if (getDate().before(new Date())) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel() + " must be in future."); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must be in future."); } } if (isRequiredEntry()) { if (get().equals("")) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel() + " must be selected."); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must be selected."); } } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java index a54ca6a2ac6..b17f008787a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class XDateDam extends XDate implements IAttributeWidget { @@ -61,7 +61,7 @@ public class XDateDam extends XDate implements IAttributeWidget { getArtifact().setSoleAttributeValue(getAttributeType(), enteredValue); } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java index b4a790af0fc..4869b126351 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFlatWidget.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -378,7 +378,7 @@ public abstract class XFlatWidget<T> extends XLabel { if (numberOfPages > maxPage) { message.add(String.format("Can't add more than [%s] page%s", maxPage, maxPage == 1 ? "" : "s")); } - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, Collections.toString(" &", message)); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Collections.toString(" &", message)); } return status; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java index 244fd5bfb23..2798c9c5d2a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloat.java @@ -15,7 +15,7 @@ import java.text.ParseException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -63,11 +63,11 @@ public class XFloat extends XText { if (!result.isOK()) { return result; } else if (!this.isFloat()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, name + " must be a Float"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, name + " must be a Float"); } else if (minValueSet && this.getFloat() < minValue) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, name + " must be >= " + minValue); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, name + " must be >= " + minValue); } else if (maxValueSet && this.getFloat() > maxValue) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, name + " must be <= " + maxValue); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, name + " must be <= " + maxValue); } } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java index 8fd3770b231..9b76f9cb79d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java @@ -19,7 +19,7 @@ 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.internal.Activator; /** * @author Donald G. Dunne @@ -63,7 +63,7 @@ public class XFloatDam extends XFloat implements IAttributeWidget { } catch (NumberFormatException ex) { // do nothing } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java index 1b2fa0690f8..086d4f7c044 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java @@ -16,7 +16,7 @@ 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.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.GroupListDialog; import org.eclipse.osee.framework.ui.swt.Displays; @@ -67,7 +67,7 @@ public class XHyperlabelGroupSelection extends XHyperlinkLabelCmdValueSelection } 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.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java index cbdee26f291..0b2938df176 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * Select users and store as single userId attributes @@ -63,11 +63,11 @@ public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implemen try { users.add(UserManager.getUserByUserId(userId)); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return users; @@ -82,7 +82,7 @@ public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implemen } artifact.setAttributeValues(attributeType, userIds); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java index 08d19ef7527..24b5cccf94c 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.model.IBasicUser; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog; /** @@ -59,7 +59,7 @@ public class XHyperlabelMemberSelection extends XHyperlinkLabelCmdValueSelection } 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.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java index 025ae58eece..8320a72fad0 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XInteger.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -44,11 +44,11 @@ public class XInteger extends XText { if (!result.isOK()) { return result; } else if (!this.isInteger()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must be an Integer"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must be an Integer"); } else if (minValueSet && this.getInteger() < minValue) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must be >= " + minValue); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must be >= " + minValue); } else if (maxValueSet && this.getInteger() > maxValue) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must be <= " + maxValue); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must be <= " + maxValue); } } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java index 3a6729b4779..f8eedc71df6 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java @@ -18,7 +18,7 @@ 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.internal.Activator; public class XIntegerDam extends XInteger implements IAttributeWidget { @@ -63,7 +63,7 @@ public class XIntegerDam extends XInteger implements IAttributeWidget { } catch (NumberFormatException ex) { // do nothing } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java index d2ec670c83e..fbac0df2541 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XLabelDam.java @@ -16,7 +16,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Result; 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.internal.Activator; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -99,7 +99,7 @@ public class XLabelDam extends GenericXWidget implements IAttributeWidget { String value = artifact.getAttributesToString(getAttributeType()); valueTextWidget.setText(value); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java index 23732d82ec8..89489e03f2a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XList.java @@ -21,7 +21,7 @@ import java.util.Set; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.jdk.core.util.AHTML; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -356,17 +356,17 @@ public class XList extends GenericXWidget { if (size >= requiredMinSelected && size <= requiredMaxSelected) { return Status.OK_STATUS; } else if (size < requiredMinSelected) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must have at least " + requiredMinSelected + " selected."); } else if (size < requiredMaxSelected) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " should only have " + requiredMaxSelected + " selected."); } else { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel()); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel()); } } if (size == 0) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel() + " must be selected."); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must be selected."); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java index df0fba41368..e87f8a67110 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListDropViewer.java @@ -21,10 +21,10 @@ import org.eclipse.osee.framework.core.operation.ClientLogger; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactTransfer; import org.eclipse.osee.framework.ui.skynet.blam.operation.StringGuidsToArtifactListOperation; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectionDialog; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; @@ -108,7 +108,7 @@ public class XListDropViewer extends XListViewer implements IXWidgetInputAddable String data = (String) cb.getContents(transfer); Branch branch = BranchSelectionDialog.getBranchFromUser(); Operations.executeAsJob(new StringGuidsToArtifactListOperation(new ClientLogger( - SkynetGuiPlugin.class), data, branch, XListDropViewer.this), true); + Activator.class), data, branch, XListDropViewer.this), true); } finally { cb.dispose(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java index 70442e68e9a..42f0c53e822 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XListViewer.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -302,17 +302,17 @@ public class XListViewer extends GenericXWidget { if (size >= requiredMinSelected && size <= requiredMaxSelected) { return Status.OK_STATUS; } else if (size < requiredMinSelected) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must have at least " + requiredMinSelected + " selected."); } else if (size < requiredMaxSelected) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " should only have " + requiredMaxSelected + " selected."); } else { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel()); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel()); } } if (size == 0) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel() + " must be selected."); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must be selected."); } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java index 8d173427d28..a21a3956f2a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMembersCombo.java @@ -17,7 +17,7 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Search; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusEvent; @@ -110,7 +110,7 @@ public class XMembersCombo extends GenericXWidget { dataCombo.setData(user.getName(), user); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } searchControl = new Search(dataCombo.getItems()); @@ -248,7 +248,7 @@ public class XMembersCombo extends GenericXWidget { @Override public IStatus isValid() { if (isRequiredEntry() && isEmpty()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Must select " + getLabel()); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Must select " + getLabel()); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java index 966e60cb2ec..962ce65d49b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercent.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -34,9 +34,9 @@ public class XPercent extends XText { if (!result.isOK()) { return result; } else if (!this.isInteger()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Percent must be an Integer"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Percent must be an Integer"); } else if (this.getInteger() < 0 || this.getInteger() > 100) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Percent must be between 0 and 100"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Percent must be between 0 and 100"); } } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java index 9085a9537ca..aa58e1633de 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XPercentDam.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class XPercentDam extends XIntegerDam { @@ -27,9 +27,9 @@ public class XPercentDam extends XIntegerDam { if (!result.isOK()) { return result; } else if (!this.isInteger()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Percent must be an Integer"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Percent must be an Integer"); } else if (this.getInteger() < 0 || this.getInteger() > 100) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Percent must be between 0 and 100"); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Percent must be between 0 and 100"); } } return Status.OK_STATUS; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtonTest.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtonTest.java index e6d62af691a..21b0ea48f80 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtonTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtonTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.logging.Level; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XRadioButton.ButtonType; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -39,7 +39,7 @@ public class XRadioButtonTest extends Composite { try { System.out.println("isSelected *" + rb.isSelected() + "*"); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } }; }); @@ -58,7 +58,7 @@ public class XRadioButtonTest extends Composite { try { System.out.println("isSelected *" + rb2.isSelected() + "*"); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } }; }); @@ -79,7 +79,7 @@ public class XRadioButtonTest extends Composite { try { System.out.println("isSelected *" + rb3.isSelected() + "*"); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } }; }); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java index b4bff324eb6..e4b63d9b5d8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XRadioButtons.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Collections; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XRadioButton.ButtonType; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.swt.SWT; @@ -266,7 +266,7 @@ public class XRadioButtons extends GenericXWidget { @Override public IStatus isValid() { if (isRequiredEntry() && isEmpty()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, getLabel() + " must have at least one selection."); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, getLabel() + " must have at least one selection."); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java index 4b9f92549c5..7a90d2b53cb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XSelectFromDialog.java @@ -21,7 +21,7 @@ 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.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.MinMaxOSEECheckedFilteredTreeDialog; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; @@ -185,7 +185,7 @@ public abstract class XSelectFromDialog<T> extends XText { // } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return selectedChanged; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java index 4646702ff19..231339ab19f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedDam.java @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.BinaryBackedAttribute; import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute; import org.eclipse.osee.framework.skynet.core.attribute.FloatingPointAttribute; import org.eclipse.osee.framework.skynet.core.attribute.IntegerAttribute; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -93,7 +93,7 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid addPage(""); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Job job = new UIJob("Update Stacked XText") { @@ -174,7 +174,7 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid xWidget.addXModifiedListener(xModifiedListener); parent.layout(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -212,7 +212,7 @@ public class XStackedDam extends XStackedWidget<String> implements IAttributeWid try { return new Date(Long.parseLong(value)); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return new Date(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java index 85697388272..862c8acb684 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XStackedWidget.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Strings; 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.internal.Activator; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.ImageManager; @@ -97,7 +97,7 @@ public abstract class XStackedWidget<T> extends XLabel { private IStatus constructStatus(int limit, String limitNoun) { String message = String.format("Has %d page(s) but the %s is %d.", stackedControl.getTotalPages(), limitNoun, limit); - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, message); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, message); } @Override diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java index 2ea0df1abdf..b7698c0b7e1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XText.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.OseeDictionary; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.Widgets; @@ -510,7 +510,7 @@ public class XText extends XWidget { return status; } if (isRequiredEntry() && isEmpty()) { - return new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, String.format("Must enter \"%s\"", getLabel())); + return new Status(IStatus.ERROR, Activator.PLUGIN_ID, String.format("Must enter \"%s\"", getLabel())); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java index 1a236eb7bc4..782005b7227 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextDam.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.validation.IOseeValidator; import org.eclipse.osee.framework.skynet.core.validation.OseeValidator; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; public class XTextDam extends XText implements IAttributeWidget { @@ -107,7 +107,7 @@ public class XTextDam extends XText implements IAttributeWidget { status = OseeValidator.getInstance().validate(IOseeValidator.SHORT, getArtifact(), getAttributeType(), get()); } catch (OseeCoreException ex) { - status = new Status(IStatus.ERROR, SkynetGuiPlugin.PLUGIN_ID, "Error getting Artifact", ex); + status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error getting Artifact", ex); } } return status; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java index 3d1785ca09c..6623a639ae8 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTextFlatDam.java @@ -35,7 +35,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.BinaryBackedAttribute; import org.eclipse.osee.framework.skynet.core.attribute.DateAttribute; import org.eclipse.osee.framework.skynet.core.attribute.FloatingPointAttribute; import org.eclipse.osee.framework.skynet.core.attribute.IntegerAttribute; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -104,7 +104,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge addPage(""); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Job job = new UIJob("Update Flat XText") { @@ -186,7 +186,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge xWidget.addXModifiedListener(xModifiedListener); parent.layout(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -221,7 +221,7 @@ public class XTextFlatDam extends XFlatWidget<String> implements IAttributeWidge try { return new Date(Long.parseLong(value)); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return new Date(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java index 7a9c21f798c..d3cded7184d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XTypeListViewer.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -39,7 +39,7 @@ public abstract class XTypeListViewer extends XListViewer { return BranchManager.getBranch(branchGuid); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return BranchManager.getLastBranch(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java index 7e911c4adfe..01893d73d47 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidget.java @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.jdk.core.type.MutableBoolean; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.Widgets; import org.eclipse.swt.SWT; @@ -197,7 +197,7 @@ public abstract class XWidget { label + " Tool Tip", toolTip); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetAccessDecorationProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetAccessDecorationProvider.java index d0320a89d1c..bf255ecc775 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetAccessDecorationProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XWidgetAccessDecorationProvider.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.AccessPolicy; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.XWidgetDecorator.Decorator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.Widgets; @@ -56,7 +56,7 @@ public class XWidgetAccessDecorationProvider implements XWidgetDecorator.Decorat policyHandlerService.hasAttributeTypePermission(Collections.singletonList(artifact), attributeType, PermissionEnum.WRITE, Level.FINE); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } // Get Info from AccessControlService; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTreeChildrenContentProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTreeChildrenContentProvider.java index ddaccfacbf7..110b5a99d8e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTreeChildrenContentProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTreeChildrenContentProvider.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * Shows artifacts and children of given class @@ -80,7 +80,7 @@ public class ArtifactTreeChildrenContentProvider implements ITreeContentProvider try { return Artifacts.getChildrenOfTypeSet((Artifact) parentElement, clazz, true).toArray(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } return EMPTY_ARRAY; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java index 4a81d0989fb..6ce4f27eba1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/ArtifactTypeFilteredTreeDialog.java @@ -20,7 +20,7 @@ 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeNameSorter; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEEFilteredTreeDialog; @@ -71,7 +71,7 @@ public class ArtifactTypeFilteredTreeDialog extends OSEEFilteredTreeDialog<Colle gd.heightHint = 500; 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 ArtifactTypeFilteredTreeDialog extends OSEEFilteredTreeDialog<Colle return new Result("Must select Artifact type."); } } 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.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeFilteredCheckTreeDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeFilteredCheckTreeDialog.java index 4320037741a..4fde433c93d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeFilteredCheckTreeDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/AttributeTypeFilteredCheckTreeDialog.java @@ -20,7 +20,7 @@ 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.skynet.core.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEECheckedFilteredTreeDialog; import org.eclipse.osee.framework.ui.skynet.widgets.AttributeContentProvider; @@ -59,7 +59,7 @@ public class AttributeTypeFilteredCheckTreeDialog extends OSEECheckedFilteredTre getTreeViewer().getViewer().setInput( selectableTypes == null ? AttributeTypeManager.getAllTypes() : selectableTypes); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return comp; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java index a50e8a066be..5ae6dae877e 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/Dialogs.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.HtmlExportTable; import org.eclipse.osee.framework.ui.skynet.util.email.EmailWizard; import org.eclipse.osee.framework.ui.swt.Displays; @@ -51,7 +51,7 @@ public class Dialogs { try { Lib.writeStringToFile(htmlText, new File(filename)); } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return Result.FalseResult; } if (openInSystem) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/GroupListDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/GroupListDialog.java index 4b6ece8eed9..97c2d385d90 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/GroupListDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/GroupListDialog.java @@ -21,8 +21,8 @@ import org.eclipse.osee.framework.skynet.core.OseeSystemArtifacts; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.branch.BranchSelectComposite; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; @@ -63,7 +63,7 @@ public class GroupListDialog extends ArtifactListDialog { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } if (getTableViewer() == null) { setArtifacts(arts); @@ -89,7 +89,7 @@ public class GroupListDialog extends ArtifactListDialog { return art.toString() + " (" + art.getBranch().getShortName() + ")"; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } art.toString(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java index 8b11787a073..91ab4a07126 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/dialog/HtmlDialog.java @@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.jdk.core.util.Lib; 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.internal.Activator; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; @@ -80,7 +80,7 @@ public class HtmlDialog extends MessageDialog { try { Lib.writeStringToFile(html, new File(file)); } catch (IOException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Program.launch(file); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java index adbb88f7246..cdf3e93e92f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetManager.java @@ -14,14 +14,14 @@ import java.util.List; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.plugin.core.util.ExtensionDefinedObjects; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne */ public class AttributeXWidgetManager { private static final String EXTENSION_NAME = "AttributeXWidgetProvider"; - private static final String EXTENSION_POINT = SkynetGuiPlugin.PLUGIN_ID + "." + EXTENSION_NAME; + private static final String EXTENSION_POINT = Activator.PLUGIN_ID + "." + EXTENSION_NAME; private static final String CLASS_NAME_ATTRIBUTE = "classname"; private final static AttributeXWidgetManager instance = new AttributeXWidgetManager(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java index 2ac022c71af..a0672468b06 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java @@ -29,8 +29,8 @@ 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.attribute.AttributeTypeManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.XWidgetParser; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.IAttributeWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; @@ -174,13 +174,13 @@ public class DynamicXWidgetLayout { IAttributeType attributeType = AttributeTypeManager.getType(xWidgetLayoutData.getStoreName()); ((IAttributeWidget) xWidget).setAttributeType(artifact, attributeType); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (xWidget instanceof IArtifactWidget) { try { ((IArtifactWidget) xWidget).setArtifact(artifact); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -256,7 +256,7 @@ public class DynamicXWidgetLayout { } refreshOrAndXOrRequiredFlags(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -267,7 +267,7 @@ public class DynamicXWidgetLayout { try { refreshOrAndXOrRequiredFlags(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -316,7 +316,7 @@ public class DynamicXWidgetLayout { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/FrameworkXWidgetProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/FrameworkXWidgetProvider.java index 2c6976fdedc..5d502445b69 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/FrameworkXWidgetProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/FrameworkXWidgetProvider.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.skynet.core.attribute.BooleanAttribute; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.IAttributeWidget; import org.eclipse.osee.framework.ui.skynet.widgets.SkynetSpellModifyDictionary; @@ -141,7 +141,7 @@ public final class FrameworkXWidgetProvider { multiBranchSelect.setSelectableItems(branches); multiBranchSelect.setRequiredSelection(1, maxSelectionRequired); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } multiBranchSelect.setRequiredEntry(true); xWidget = multiBranchSelect; @@ -159,7 +159,7 @@ public final class FrameworkXWidgetProvider { try { xWidget = new XMembersList(name); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (xWidgetName.equals("XMembersCombo")) { xWidget = new XMembersCombo(name); @@ -331,7 +331,7 @@ public final class FrameworkXWidgetProvider { widget.setSelection(BranchManager.getBranchByGuid(branchGuid)); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } xWidget = widget; } else if (xWidgetName.equals(XArtifactTypeComboViewer.WIDGET_ID)) { @@ -385,7 +385,7 @@ public final class FrameworkXWidgetProvider { private static Collection<IXWidgetProvider> getXWidgetProviders() { ExtensionDefinedObjects<IXWidgetProvider> contributions = - new ExtensionDefinedObjects<IXWidgetProvider>(SkynetGuiPlugin.PLUGIN_ID + ".XWidgetProvider", + new ExtensionDefinedObjects<IXWidgetProvider>(Activator.PLUGIN_ID + ".XWidgetProvider", "XWidgetProvider", "classname"); return contributions.getObjects(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java index 3f0812cc513..6d05781d059 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.osgi.framework.Bundle; /** @@ -43,7 +43,7 @@ public class WorkDefinitionProvider { Object obj = taskClass.newInstance(); workDefinitionProviders.add((IWorkDefinitionProvider) obj); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Error loading WorkDefinitionProvider extension", ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java index 1a2b71215b2..b37f96201ee 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java @@ -30,7 +30,7 @@ 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.internal.Activator; /** * @author Donald G. Dunne @@ -257,7 +257,7 @@ public class WorkFlowDefinition extends WorkItemWithChildrenDefinition { for (String transition : artifact.getAttributesToStringList(CoreAttributeTypes.WorkTransition)) { String[] strs = transition.split(";"); if (strs.length != 3) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, new OseeStateException( + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, new OseeStateException( "Transition attribute from artifact [%s] is invalid. Must be <fromState>;<transitionType>;<toState>", artifact.getGuid())); continue; @@ -453,7 +453,7 @@ public class WorkFlowDefinition extends WorkItemWithChildrenDefinition { try { return id + " - " + name + (parentId != null ? " - Parent: " + parentId : "") + getPageNames().toString(); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); return id + " - " + name; } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java index 4910d47b3da..af0bb423b91 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkItemDefinitionFactory.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinition.WriteType; /** @@ -75,7 +75,7 @@ public class WorkItemDefinitionFactory { public synchronized static void loadDefinitions(boolean force) throws OseeCoreException { if (itemIdToDefinition == null || force) { - OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "Loading Work Item Definitions"); + OseeLog.log(Activator.class, Level.INFO, "Loading Work Item Definitions"); itemIdToDefinition = new HashMap<String, WorkItemDefinition>(); itemIdToWidArtifact = new HashMap<String, Artifact>(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkPage.java index 6ea52b43a82..84eb62505cb 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkPage.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkPage.java @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.internal.Activator; 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.XWidget; @@ -64,7 +64,7 @@ public class WorkPage implements IDynamicWidgetLayoutListener, IWorkPage { processXmlLayoutDatas(xWidgetsXml); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, "Error processing attributes", ex); + OseeLog.log(Activator.class, Level.SEVERE, "Error processing attributes", ex); } } @@ -121,7 +121,7 @@ public class WorkPage implements IDynamicWidgetLayoutListener, IWorkPage { layoutData.getXWidget().dispose(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -149,7 +149,7 @@ public class WorkPage implements IDynamicWidgetLayoutListener, IWorkPage { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return Result.TrueResult; } @@ -192,7 +192,7 @@ public class WorkPage implements IDynamicWidgetLayoutListener, IWorkPage { workFlowDefinition.getPageDefinitions(workPageDefinition.getId(), TransitionType.ToPage)) ? " (return)" : "") + "\n"); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return sb.toString(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkWidgetDefinition.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkWidgetDefinition.java index 17a280848d8..263a3d827e3 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkWidgetDefinition.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkWidgetDefinition.java @@ -18,8 +18,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.util.Conditions; 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.XWidgetParser; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -64,7 +64,7 @@ public class WorkWidgetDefinition extends WorkItemDefinition { // Hand out an modifiable copy of the LayoutData to ensure widgets created off it aren't shared data = (DynamicXWidgetLayoutData) widgetLayoutData.clone(); } catch (CloneNotSupportedException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return data; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java index 30497f6cc99..55d98e4f665 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchView.java @@ -44,9 +44,9 @@ import org.eclipse.osee.framework.skynet.core.event.model.TransactionEventType; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.action.EditTransactionComment; import org.eclipse.osee.framework.ui.skynet.action.ITransactionRecordSelectionProvider; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.GenericViewPart; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.swt.dnd.Clipboard; @@ -122,7 +122,7 @@ public class BranchView extends GenericViewPart implements IBranchEventListener, menuManager.add(new ColumnMultiEditAction(branchWidget)); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -163,7 +163,7 @@ public class BranchView extends GenericViewPart implements IBranchEventListener, xBranchWidget.loadData(); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -178,7 +178,7 @@ public class BranchView extends GenericViewPart implements IBranchEventListener, try { xBranchWidget.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.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java index 26cc2ab51b6..dff70921a3f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewImageHandler.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.osee.framework.ui.swt.OverlayImage; import org.eclipse.swt.graphics.Image; @@ -68,7 +68,7 @@ public class BranchViewImageHandler { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (element instanceof TransactionRecord && columnIndex == 0) { diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java index 08869df20c0..c42f35f4c75 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchViewPresentationPreferences.java @@ -19,13 +19,13 @@ import org.eclipse.core.runtime.preferences.IPreferencesService; import org.eclipse.core.runtime.preferences.InstanceScope; 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.commandHandlers.branch.FlatPresentationHandler; import org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.HierarchicalPresentationHandler; import org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.ShowArchivedBranchHandler; import org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.ShowFavoriteBranchesFirstHandler; import org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.ShowMergeBranchPresentationHandler; import org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.ShowTransactionPresentationHandler; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; import org.osgi.service.prefs.BackingStoreException; @@ -62,7 +62,7 @@ public class BranchViewPresentationPreferences { ((IEclipsePreferences) instanceNode.node(BranchView.VIEW_ID)).addPreferenceChangeListener(singletonPreferenceChangeListener()); } } catch (BackingStoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } instanceNode.addNodeChangeListener(new IEclipsePreferences.INodeChangeListener() { @@ -145,7 +145,7 @@ public class BranchViewPresentationPreferences { try { getViewPreference().flush(); } catch (BackingStoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java index 936a2e62025..c57709db900 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/BranchXViewer.java @@ -33,7 +33,7 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.PromptChangeUtil; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.widgets.Composite; @@ -78,7 +78,7 @@ public class BranchXViewer extends XViewer { PromptChangeUtil.promptChangeBranchArchivedState(treeItems); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -130,7 +130,7 @@ public class BranchXViewer extends XViewer { xBranchViewer.refresh(); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex.toString(), ex); + OseeLog.log(Activator.class, Level.SEVERE, ex.toString(), ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java index 04233e48027..ce34056fb60 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/FavoriteSorter.java @@ -19,7 +19,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Jeff C. Phillips @@ -46,7 +46,7 @@ public class FavoriteSorter extends XViewerSorter { return fav1 ? -1 : 1; } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (o1 instanceof Branch && !(o2 instanceof Branch)) { return -1; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java index f49dbce3080..cdf0d29f2a1 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchLabelProvider.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.swt.graphics.Image; /** @@ -206,7 +206,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider { return ArtifactImageManager.getImage(BranchManager.getAssociatedArtifact((Branch) element)); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } else if (element instanceof TransactionRecord) { try { @@ -220,7 +220,7 @@ public class XBranchLabelProvider extends XViewerLabelProvider { return ArtifactImageManager.getImage(artifact); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java index 0a6d0fe61ec..4f50adb0120 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/XBranchWidget.java @@ -29,7 +29,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.plugin.PluginUiImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; 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; @@ -178,7 +178,7 @@ public class XBranchWidget extends GenericXWidget { try { BranchManager.refreshBranches(); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } loadData(); } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java index 207731224c4..a2f57b2d90b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/HistoryView.java @@ -52,11 +52,11 @@ import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.OpenContributionItem; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.action.EditTransactionComment; import org.eclipse.osee.framework.ui.skynet.action.ITransactionRecordSelectionProvider; import org.eclipse.osee.framework.ui.skynet.action.WasIsCompareEditorAction; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener; import org.eclipse.osee.framework.ui.skynet.menu.CompareArtifactAction; import org.eclipse.osee.framework.ui.skynet.util.SkynetViews; @@ -114,7 +114,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener historyView.explore(artifact, loadHistory); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -238,7 +238,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -271,7 +271,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener try { ChangeUiUtil.open(((Change) selectedObject).getTxDelta().getStartTx()); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -321,7 +321,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "History View error on init", ex); + OseeLog.log(Activator.class, Level.WARNING, "History View error on init", ex); } } @@ -341,7 +341,7 @@ public class HistoryView extends GenericViewPart implements IBranchEventListener try { explore(artifact, true); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java index 9364a9928b4..29bd7ad4e6f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xHistory/XHistoryWidget.java @@ -32,7 +32,7 @@ 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.plugin.PluginUiImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget; import org.eclipse.osee.framework.ui.swt.ALayout; @@ -249,7 +249,7 @@ public class XHistoryWidget extends GenericXWidget { } }); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return Status.OK_STATUS; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java index dec9b22c9ab..83b3abc51bf 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/DefaultHierarchySorter.java @@ -17,7 +17,7 @@ import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; 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.internal.Activator; /** * @author Jeff C. Phillips @@ -69,7 +69,7 @@ public class DefaultHierarchySorter implements Comparator<Artifact> { } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return 0; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java index 756848ea308..5ce012977db 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java @@ -24,7 +24,7 @@ import org.eclipse.osee.framework.skynet.core.change.Change; import org.eclipse.osee.framework.skynet.core.change.ErrorChange; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; @@ -127,7 +127,7 @@ public class XChangeLabelProvider extends XViewerLabelProvider { return ArtifactImageManager.getChangeTypeImage(change); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return null; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ConflictHandlingOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ConflictHandlingOperation.java index fa3e6631113..474d2605dbd 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ConflictHandlingOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ConflictHandlingOperation.java @@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.util.Conditions; import org.eclipse.osee.framework.skynet.core.conflict.Conflict; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Karol M. Wilk @@ -37,7 +37,7 @@ public final class ConflictHandlingOperation extends AbstractOperation { private final ConflictOperationEnum operation; public ConflictHandlingOperation(ConflictOperationEnum operation, Collection<Conflict> conflicts) { - super("Updating conflicts", SkynetGuiPlugin.PLUGIN_ID); + super("Updating conflicts", Activator.PLUGIN_ID); this.conflicts = conflicts; this.operation = operation; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java index 0d330d0ce30..f0e3483bf5a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/DiffHandler.java @@ -26,7 +26,7 @@ import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; import org.eclipse.osee.framework.skynet.core.conflict.Conflict; import org.eclipse.osee.framework.ui.plugin.util.AbstractSelectionEnabledHandler; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; class DiffHandler extends AbstractSelectionEnabledHandler { private final int diffToShow; @@ -139,7 +139,7 @@ class DiffHandler extends AbstractSelectionEnabledHandler { break; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else if (conflicts.get(0) instanceof ArtifactConflict) { @@ -171,7 +171,7 @@ class DiffHandler extends AbstractSelectionEnabledHandler { return false; } } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java index 98e95101bc8..554f3d53d5d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java @@ -27,7 +27,7 @@ import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; import org.eclipse.osee.framework.skynet.core.conflict.Conflict; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.swt.Displays; @@ -86,7 +86,7 @@ public class MergeUtility { if (shell != null) { MessageDialog.openInformation(shell, "Attention", COMMITED_PROMPT); } else { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Attention: " + COMMITED_PROMPT); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, "Attention: " + COMMITED_PROMPT); } return false; } @@ -138,7 +138,7 @@ public class MergeUtility { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -151,7 +151,7 @@ public class MergeUtility { return ArtifactQuery.getHistoricalArtifactFromId(conflict.getArtifact().getGuid(), baseTransaction, INCLUDE_DELETED); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } return null; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index aa6bc5884f9..2dae4507312 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -63,7 +63,7 @@ import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.ArtifactExplorer; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.util.SkynetViews; @@ -174,7 +174,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, mergeView.explore(sourceBranch, destBranch, tranId, commitTrans, showConflicts); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -250,7 +250,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, addRevertUnresolvableConflictsMenuItem(menuManager); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } }); @@ -695,7 +695,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -719,7 +719,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, sourceBranchId = memento.getInteger(SOURCE_BRANCH_ID); final Branch sourceBranch = BranchManager.getBranch(sourceBranchId); if (sourceBranch == null) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, + OseeLog.log(Activator.class, Level.WARNING, "Merge View can't init due to invalid source branch id " + sourceBranchId); mergeXWidget.setLabel("Could not restore this Merge View"); return; @@ -727,7 +727,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, destBranchId = memento.getInteger(DEST_BRANCH_ID); final Branch destBranch = BranchManager.getBranch(destBranchId); if (destBranch == null) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, + OseeLog.log(Activator.class, Level.WARNING, "Merge View can't init due to invalid destination branch id " + sourceBranchId); mergeXWidget.setLabel("Could not restore this Merge View"); return; @@ -737,7 +737,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, TransactionManager.getTransactionId(memento.getInteger(TRANSACTION_NUMBER)); openViewUpon(sourceBranch, destBranch, transactionId, null, false); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, + OseeLog.log(Activator.class, Level.WARNING, "Merge View can't init due to invalid transaction id " + transactionId); mergeXWidget.setLabel("Could not restore this Merge View due to invalid transaction id " + transactionId); return; @@ -748,7 +748,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.WARNING, "Merge View error on init", ex); + OseeLog.log(Activator.class, Level.WARNING, "Merge View error on init", ex); } } @@ -819,7 +819,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, break; } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -943,7 +943,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } if (!deletedPurgedArts.isEmpty()) { @@ -961,7 +961,7 @@ public class MergeView extends GenericViewPart implements IBranchEventListener, showConflicts); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java index 44ca7a9c8ce..12230b6024d 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java @@ -34,9 +34,9 @@ import org.eclipse.osee.framework.skynet.core.event.model.BranchEventType; import org.eclipse.osee.framework.skynet.core.httpRequests.CreateBranchHttpRequestOperation; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.compare.AttributeCompareItem; import org.eclipse.osee.framework.ui.skynet.compare.CompareHandler; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.mergeWizard.ConflictResolutionWizard; import org.eclipse.osee.framework.ui.swt.Displays; import org.eclipse.osee.framework.ui.swt.Widgets; @@ -180,7 +180,7 @@ public class MergeXViewer extends XViewer { handleResolvableConflictClick(treeColumn, conflict, shell); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -244,7 +244,7 @@ public class MergeXViewer extends XViewer { try { conWizard.setResolution(); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java index 9356c9e23cc..a721a13aef5 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXWidget.java @@ -49,11 +49,11 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.ListSelectionDialogNoSave; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.change.ChangeUiUtil; import org.eclipse.osee.framework.ui.skynet.cm.IOseeCmService; import org.eclipse.osee.framework.ui.skynet.cm.OseeCmEditor; import org.eclipse.osee.framework.ui.skynet.internal.ServiceProvider; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; import org.eclipse.osee.framework.ui.skynet.render.RendererManager; import org.eclipse.osee.framework.ui.skynet.widgets.GenericXWidget; @@ -202,7 +202,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { Branch mergeBranch = BranchManager.getMergeBranch(conflict.getSourceBranch(), destinationBranch); conflict.applyPreviousMerge(mergeBranch.getId(), destBranchId); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } finally { monitor.worked(1); } @@ -238,7 +238,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return Status.OK_STATUS; @@ -385,7 +385,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { mergeXViewer.setConflicts(conflicts); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } return Status.OK_STATUS; } @@ -427,7 +427,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { openAssociatedArtifactAction.setEnabled(true); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -558,7 +558,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { ConflictManagerExternal conflictManager = new ConflictManagerExternal(destBranch, sourceBranch); BranchManager.completeUpdateBranch(conflictManager, true, false); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -587,7 +587,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { AWorkbench.popup("ERROR", "Unknown branch association"); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -611,13 +611,13 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { try { ChangeUiUtil.open(sourceBranch); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } else { try { ChangeUiUtil.open(firstConflict.getCommitTransactionId()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -639,7 +639,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { try { ChangeUiUtil.open(conflicts[0].getDestBranch()); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -700,7 +700,7 @@ public class MergeXWidget extends GenericXWidget implements IAdaptable { "This Source Branch has had No Prior Merges", 2, new String[] {"OK"}, 1).open(); } } catch (OseeCoreException 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java index 4052a4414e0..f7464323959 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/ThreeWayWordMergeOperation.java @@ -32,7 +32,7 @@ import org.eclipse.osee.framework.plugin.core.util.AIFile; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.render.IRenderer; import org.eclipse.osee.framework.ui.skynet.render.ITemplateRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; @@ -67,7 +67,7 @@ public class ThreeWayWordMergeOperation extends AbstractOperation { private final AttributeConflict attributeConflict; public ThreeWayWordMergeOperation(AttributeConflict attributeConflict) { - super("Generate 3 Way Merge", SkynetGuiPlugin.PLUGIN_ID); + super("Generate 3 Way Merge", Activator.PLUGIN_ID); this.attributeConflict = attributeConflict; } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java index 0dd30c6d365..e03af76bc79 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java @@ -20,7 +20,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.conflict.Conflict; import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.swt.ImageManager; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; @@ -193,7 +193,7 @@ public class XMergeLabelProvider extends XViewerLabelProvider { } } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } } return null; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java index b1599e65fe3..cf165c3ca81 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/OseeXViewerTreeReport.java @@ -16,7 +16,7 @@ import org.eclipse.nebula.widgets.xviewer.XViewerTreeReport; import org.eclipse.osee.framework.core.util.XResultData; 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.internal.Activator; import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.swt.widgets.TreeItem; @@ -39,7 +39,7 @@ public class OseeXViewerTreeReport extends XViewerTreeReport { xResultData.addRaw(html); XResultDataUI.report(xResultData, title, Manipulations.RAW_HTML); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java index 1746b7dd8ef..f42642a5109 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetCustomizations.java @@ -34,7 +34,7 @@ import org.eclipse.osee.framework.skynet.core.event.listener.IArtifactEventListe import org.eclipse.osee.framework.skynet.core.event.model.ArtifactEvent; import org.eclipse.osee.framework.skynet.core.event.model.EventModType; import org.eclipse.osee.framework.skynet.core.event.model.Sender; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; /** * @author Donald G. Dunne @@ -252,7 +252,7 @@ public class SkynetCustomizations implements IXViewerCustomizations, IArtifactEv } } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java index 338049ec9c4..310b635e370 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java @@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.AXml; 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.internal.Activator; /** * This class provides the functionality necessary to store the user's defaults in their User Artifact @@ -73,7 +73,7 @@ public class SkynetUserArtifactCustomizeDefaults { try { xml = user.getSoleAttributeValue(CoreAttributeTypes.XViewerDefaults, ""); } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); xml = ""; } } @@ -89,7 +89,7 @@ public class SkynetUserArtifactCustomizeDefaults { } user.persist(getClass().getSimpleName()); } 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.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java index 6495bf94bb7..1b27008a2c2 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java @@ -30,7 +30,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.plugin.OseeUiActivator; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; +import org.eclipse.osee.framework.ui.skynet.internal.Activator; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.OseeXViewerTreeReport; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.ArtifactNameColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.AttributeColumn; @@ -67,7 +67,7 @@ public class SkynetXViewerFactory extends XViewerFactory { try { registerColumns(getAllAttributeColumns().toArray(new XViewerColumn[AttributeTypeManager.getAllTypes().size()])); } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -83,7 +83,7 @@ public class SkynetXViewerFactory extends XViewerFactory { registerColumns(xCol); } } catch (Exception ex) { - OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex); + OseeLog.log(Activator.class, Level.SEVERE, ex); } } @@ -111,7 +111,7 @@ public class SkynetXViewerFactory extends XViewerFactory { attributeTypes.addAll(art.getAttributeTypes()); } } catch (OseeCoreException ex) { - OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); + OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); } Set<String> attrNames = new HashSet<String>(); // Add Name first |