diff options
author | ddunne | 2009-01-27 20:53:20 +0000 |
---|---|---|
committer | ddunne | 2009-01-27 20:53:20 +0000 |
commit | 78f4d1555a2cdcbe15a9bd8c981bd6a2d52e9468 (patch) | |
tree | f59aa89fd8f5999eaca488b502c253bc11ec4b2e | |
parent | fd518ea7be5304b913bf963b27fbdd0ba9a39e0e (diff) | |
download | org.eclipse.osee-78f4d1555a2cdcbe15a9bd8c981bd6a2d52e9468.tar.gz org.eclipse.osee-78f4d1555a2cdcbe15a9bd8c981bd6a2d52e9468.tar.xz org.eclipse.osee-78f4d1555a2cdcbe15a9bd8c981bd6a2d52e9468.zip |
"Team Workflow" - E1NFM - "Convert OSEELog UI popup calls with new OseeLog with Popup severity"
215 files changed, 842 insertions, 728 deletions
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java index b5ca150c8d0..b0dbcc432c4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewAction.java @@ -17,7 +17,8 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.actions.wizard.NewActionWizard; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.config.AtsBulkLoadCache; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.ui.PlatformUI; /** @@ -61,7 +62,7 @@ public class NewAction extends Action { dialog.create(); dialog.open(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java index a27ee5b3e0c..45c65756c0a 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage1.java @@ -24,12 +24,12 @@ import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.util.widgets.dialog.AITreeContentProvider; import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEECheckedFilteredTree; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XText; @@ -124,7 +124,7 @@ public class NewActionPage1 extends WizardPage { if (wizard.getInitialAias() != null) treeViewer.setInitalChecked(wizard.getInitialAias()); ((XText) getXWidget("Title")).setFocus(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java index bc7ade72c32..67ed89bd680 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage2.java @@ -15,7 +15,8 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ATSAttributes; import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.widgets.XCombo; import org.eclipse.osee.framework.ui.skynet.widgets.XList; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; @@ -89,7 +90,7 @@ public class NewActionPage2 extends WizardPage { setControl(comp); setHelpContexts(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java index eb9b449d652..507b60736f4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionPage3.java @@ -24,10 +24,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; 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.WorkPage; @@ -62,7 +62,7 @@ public class NewActionPage3 extends WizardPage { if (item.hasWizardXWidgetExtensions(wizard.getSelectedActionableItemArtifacts())) item.wizardCompleted( action, wizard, transaction); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -93,7 +93,7 @@ public class NewActionPage3 extends WizardPage { if (item.hasWizardXWidgetExtensions(wizard.getSelectedActionableItemArtifacts())) item.getWizardXWidgetExtensions( wizard.getSelectedActionableItemArtifacts(), sb); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } sb.append("</WorkPage>"); @@ -104,7 +104,7 @@ public class NewActionPage3 extends WizardPage { comp.layout(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -155,7 +155,7 @@ public class NewActionPage3 extends WizardPage { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.ats.AtsWizardItem"); if (point == null) { - OSEELog.logSevere(AtsPlugin.class, "Can't access AtsWizardItem extension point", true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access AtsWizardItem extension point"); return; } IExtension[] extensions = point.getExtensions(); @@ -174,7 +174,7 @@ public class NewActionPage3 extends WizardPage { Object obj = taskClass.newInstance(); wizardExtensionItems.add((IAtsWizardItem) obj); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Error loading AtsWizardItem extension", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error loading AtsWizardItem extension", ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java index 04d80e4fa1c..5904bc2da80 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/wizard/NewActionWizard.java @@ -22,10 +22,11 @@ import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.util.AtsPriority.PriorityType; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; import org.eclipse.osee.framework.ui.skynet.widgets.XCombo; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; @@ -74,7 +75,7 @@ public class NewActionWizard extends Wizard implements INewWizard { job.setPriority(Job.LONG); job.schedule(); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return false; } return true; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java index e4843b890cf..982cf5d5f2b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSLog.java @@ -24,11 +24,11 @@ import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; +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.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -133,7 +133,7 @@ public class ATSLog { } artifact.setSoleAttributeValue(ATSAttributes.LOG_ATTRIBUTE.getStoreName(), Jaxp.getDocumentXml(doc)); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't create ats log document", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't create ats log document", ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSNote.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSNote.java index 9712cb669c8..5fae8a6b171 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSNote.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ATSNote.java @@ -18,12 +18,12 @@ import java.util.logging.Level; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; +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.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.ats.NoteType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; @@ -73,7 +73,7 @@ public class ATSNote { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return logItems; } @@ -94,7 +94,7 @@ public class ATSNote { } artifact.setSoleAttributeValue(ATSAttributes.STATE_NOTES_ATTRIBUTE.getStoreName(), Jaxp.getDocumentXml(doc)); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't create ats note document", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't create ats note document", ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java index 2604c30c712..7d6b9dcd4ee 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java @@ -35,6 +35,7 @@ import org.eclipse.osee.ats.world.IWorldViewArtifact; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -51,7 +52,6 @@ import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.email.EmailGroup; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition; @@ -268,7 +268,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld // These will be processed upon save AtsNotifyUsers.notify(this, newAssignees, AtsNotifyUsers.NotifyType.Assigned); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -512,8 +512,8 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld public String getWorldViewCompletedDateStr() throws OseeCoreException { if (smaMgr.isCompleted()) { if (getWorldViewCompletedDate() == null) { - OSEELog.logSevere(AtsPlugin.class, "Completed with no date => " + smaMgr.getSma().getHumanReadableId(), - true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, + "Completed with no date => " + smaMgr.getSma().getHumanReadableId()); return XViewerCells.getCellExceptionString("Completed with no date."); } return new XDate(getWorldViewCompletedDate()).getMMDDYYHHMM(); @@ -699,10 +699,10 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld double val = new Float(value).doubleValue(); if (val == 0) return new Result("Weekly Benefit Hours not set."); } catch (NumberFormatException ex) { - OSEELog.logException(AtsPlugin.class, "HRID " + getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "HRID " + getHumanReadableId(), ex); return new Result("Weekly Benefit value is invalid double \"" + value + "\""); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "HRID " + getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "HRID " + getHumanReadableId(), ex); return new Result("Exception calculating cost avoidance. See log for details."); } return Result.TrueResult; @@ -767,7 +767,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld for (Artifact artifact : artifacts) artifact.persistAttributesAndRelations(transaction); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't save artifact " + getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't save artifact " + getHumanReadableId(), ex); } } @@ -778,7 +778,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld for (Artifact artifact : artifacts) artifact.reloadAttributesAndRelations(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't revert artifact " + getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't revert artifact " + getHumanReadableId(), ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java index 1062c65bfc4..81c72a5000a 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java @@ -31,6 +31,7 @@ import org.eclipse.osee.ats.world.IWorldViewArtifact; import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
+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.skynet.core.UserManager;
@@ -44,7 +45,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
@@ -94,7 +94,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement try {
getParentActionArtifact().resetAttributesOffChildren(transaction);
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, "Can't reset Action parent of children", ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't reset Action parent of children", ex);
}
}
@@ -154,7 +154,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement }
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return users;
}
@@ -354,7 +354,7 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement toReturn = actionableItemsTx(AtsPlugin.getAtsBranch(), selectedAlias, null);
}
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
toReturn = Result.FalseResult;
}
return toReturn;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowExtensions.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowExtensions.java index 9ee0c13f1a2..e8e4b6c7893 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowExtensions.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkflowExtensions.java @@ -19,7 +19,8 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.actions.wizard.IAtsTeamWorkflow; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.osgi.framework.Bundle; /** @@ -54,7 +55,7 @@ public class TeamWorkflowExtensions { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.ats.AtsTeamWorkflow"); if (point == null) { - OSEELog.logSevere(AtsPlugin.class, "Can't access AtsTeamWorkflow extension point", true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access AtsTeamWorkflow extension point"); return teamWorkflowExtensionItems; } IExtension[] extensions = point.getExtensions(); @@ -73,7 +74,7 @@ public class TeamWorkflowExtensions { Object obj = taskClass.newInstance(); teamWorkflowExtensionItems.add((IAtsTeamWorkflow) obj); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Error loading AtsTeamWorkflow extension", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error loading AtsTeamWorkflow extension", ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig.java index 5fbf4190128..aaa270bed3e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/AtsConfig.java @@ -15,12 +15,13 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.ArtifactPersistenceManager; import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -112,7 +113,7 @@ public class AtsConfig { art.persistAttributesAndRelations(transaction); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java index 7785b97a6de..e925965016b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizard.java @@ -25,13 +25,14 @@ import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.workflow.editor.AtsWorkflowConfigEditor;
import org.eclipse.osee.ats.workflow.editor.wizard.AtsWorkflowConfigCreationWizard;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+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.skynet.core.artifact.ArtifactTypeManager;
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.ats.AtsOpenOption;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.ui.INewWizard;
@@ -136,7 +137,7 @@ public class AtsConfigWizard extends Wizard implements INewWizard { AtsWorkflowConfigEditor.editWorkflow(workFlowDefinition);
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return true;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizardPage1.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizardPage1.java index aa12befd739..82a82653a3e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizardPage1.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/config/wizard/AtsConfigWizardPage1.java @@ -17,7 +17,8 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XText; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; @@ -130,7 +131,7 @@ public class AtsConfigWizardPage1 extends WizardPage { }); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsStateItems.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsStateItems.java index 1ede0af246c..61e1b86db5f 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsStateItems.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/AtsStateItems.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.osgi.framework.Bundle; /** @@ -47,7 +47,7 @@ public class AtsStateItems { if (stateItems.size() > 0) return; IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.ats.AtsStateItem"); if (point == null) { - OSEELog.logSevere(AtsPlugin.class, "Can't access AtsStateItem extension point", true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access AtsStateItem extension point"); return; } IExtension[] extensions = point.getExtensions(); @@ -65,13 +65,13 @@ public class AtsStateItems { Class taskClass = bundle.loadClass(classname); Object obj = taskClass.newInstance(); if (obj == null) { - OseeLog.log(AtsPlugin.class, Level.SEVERE, + OseeLog.log(AtsPlugin.class, Level.SEVERE, "Error Instantiating AtsStateItem extension \"" + classname + "\"", null); } else { stateItems.add((IAtsStateItem) obj); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Error loading AtsStateItem extension", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error loading AtsStateItem extension", ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java index 5a12edd5971..6d074e3dceb 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java @@ -32,6 +32,7 @@ import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.world.AtsMetricsComposite; import org.eclipse.osee.ats.world.IAtsMetricsProvider; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.skynet.core.access.PermissionEnum; @@ -66,7 +67,6 @@ import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; import org.eclipse.osee.framework.ui.skynet.history.RevisionHistoryView; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -137,7 +137,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito transaction.execute(); workFlowTab.refresh(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } onDirtied(); } @@ -199,7 +199,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito return result; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return new Result(true, ex.getLocalizedMessage()); } } @@ -272,7 +272,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito setActivePage(workFlowPageIndex); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } enableGlobalPrint(); @@ -344,7 +344,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito try { smaMgr.getSma().persistAttributes(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -517,7 +517,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito page.openEditor(new SMAEditorInput(sma), EDITOR_ID); VisitedItems.addVisited(sma); } catch (PartInitException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java index 121dd78a6cc..e3e3a443894 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAManager.java @@ -48,6 +48,7 @@ import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.db.connection.exception.OseeStateException; +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.skynet.core.UserManager; @@ -60,7 +61,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ChangeTypeDialog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.DateSelectionDialog; @@ -188,7 +188,7 @@ public class SMAManager { try { return ((TeamWorkFlowArtifact) getSma()).getTeamDefinition().isTeamUsesVersions(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return false; } } @@ -206,7 +206,7 @@ public class SMAManager { try { return ((TeamWorkFlowArtifact) getSma()).getTeamDefinition().hasWorkRule(ruleId); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return false; } } @@ -408,7 +408,7 @@ public class SMAManager { } return true; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't change priority", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't change priority", ex); return false; } } @@ -446,7 +446,7 @@ public class SMAManager { } return true; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't change priority", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't change priority", ex); return false; } } @@ -530,7 +530,7 @@ public class SMAManager { } } } catch (OseeStateException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; @@ -541,7 +541,7 @@ public class SMAManager { return ArtifactPromptChange.promptChangeFloatAttribute(atsAttr.getStoreName(), atsAttr.getDisplayName(), Arrays.asList(sma), persist); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -551,7 +551,7 @@ public class SMAManager { return ArtifactPromptChange.promptChangeIntegerAttribute(atsAttr.getStoreName(), atsAttr.getDisplayName(), Arrays.asList(sma), persist); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -561,7 +561,7 @@ public class SMAManager { return ArtifactPromptChange.promptChangePercentAttribute(atsAttr.getStoreName(), atsAttr.getDisplayName(), Arrays.asList(new Artifact[] {sma}), persist); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -571,7 +571,7 @@ public class SMAManager { return ArtifactPromptChange.promptChangeBoolean(atsAttr.getStoreName(), atsAttr.getDisplayName(), Arrays.asList(sma), toggleMessage, persist); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -586,7 +586,7 @@ public class SMAManager { return ArtifactPromptChange.promptChangeStringAttribute(atsAttr.getStoreName(), atsAttr.getDisplayName(), Arrays.asList(new Artifact[] {sma}), persist, multiLine); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -596,7 +596,7 @@ public class SMAManager { return ArtifactPromptChange.promptChangeStringAttribute(atsAttr.getStoreName(), atsAttr.getDisplayName(), Arrays.asList(sma), persist, multiLine); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -605,8 +605,8 @@ public class SMAManager { try { return ArtifactPromptChange.promptChangeDate(atsAttr.getStoreName(), atsAttr.getDisplayName(), sma, persist); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, - "Can't save " + atsAttr.getDisplayName() + " date to artifact " + sma.getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, + "Can't save " + atsAttr.getDisplayName() + " date to artifact " + sma.getHumanReadableId(), ex); } return false; } @@ -644,7 +644,7 @@ public class SMAManager { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't save release date " + sma.getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't save release date " + sma.getHumanReadableId(), ex); } return false; } @@ -682,7 +682,8 @@ public class SMAManager { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Can't save est release date " + sma.getHumanReadableId(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, + "Can't save est release date " + sma.getHumanReadableId(), ex); } return false; } @@ -835,7 +836,7 @@ public class SMAManager { OseeNotificationManager.sendNotifications(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return new Result("Transaction failed " + ex.getLocalizedMessage()); } return Result.TrueResult; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java index a2a518d97cb..4de4de18273 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAPrint.java @@ -16,9 +16,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.NoteItem;
import org.eclipse.osee.ats.world.IWorldViewArtifact;
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.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
/**
@@ -89,7 +90,7 @@ public class SMAPrint extends Action { resultData.addRaw(smaMgr.getLog().getHtml());
resultData.report(smaMgr.getSma().getDescriptiveName(), Manipulations.RAW_HTML);
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java index 2fd22808124..7ecdae31e88 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMARelationsHyperlinkComposite.java @@ -19,12 +19,13 @@ import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -149,7 +150,7 @@ public class SMARelationsHyperlinkComposite extends Composite { smaMgr.getEditor().onDirtied(); refreshActionableItemsLabel(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java index 7a69eed6bf8..92ae4100d97 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java @@ -36,6 +36,7 @@ import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.db.connection.exception.OseeStateException; +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.skynet.core.UserManager; @@ -44,7 +45,6 @@ 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.util.Result; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; @@ -186,7 +186,7 @@ public class SMAWorkFlowSection extends SectionPart { Result result = item.pageCreated(toolkit, atsWorkPage, smaMgr, xModListener, isEditable || isGlobalEditable); if (result.isFalse()) { result.popup(); - OSEELog.logSevere(AtsPlugin.class, "Error in page creation => " + result.getText(), true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error in page creation => " + result.getText()); } } @@ -345,7 +345,7 @@ public class SMAWorkFlowSection extends SectionPart { try { handleChangeCurrentAssignees(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -383,7 +383,7 @@ public class SMAWorkFlowSection extends SectionPart { private void handleChangeTransitionAssignees() throws OseeCoreException { WorkPageDefinition toWorkPage = (WorkPageDefinition) transitionToStateCombo.getSelected(); if (toWorkPage == null) { - OSEELog.logException(AtsPlugin.class, "No Transition State Selected", null, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "No Transition State Selected"); return; } if (toWorkPage.isCancelledPage() || toWorkPage.isCompletePage()) { @@ -476,7 +476,7 @@ public class SMAWorkFlowSection extends SectionPart { try { handleChangeTransitionAssignees(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -567,7 +567,7 @@ public class SMAWorkFlowSection extends SectionPart { WorkPageDefinition toWorkPageDefinition = (WorkPageDefinition) transitionToStateCombo.getSelected(); if (toWorkPageDefinition == null) { - OSEELog.logException(AtsPlugin.class, "No Transition State Selected", null, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "No Transition State Selected"); return; } if (toWorkPageDefinition.getPageName().equals(DefaultTeamState.Cancelled.name())) { @@ -676,7 +676,7 @@ public class SMAWorkFlowSection extends SectionPart { smaMgr.setInTransition(false); smaMgr.getEditor().refreshPages(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } finally { smaMgr.setInTransition(false); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java index 18c637fa04f..dc22800db67 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExis import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.utility.Artifacts; import org.eclipse.osee.framework.ui.plugin.util.Displays; @@ -40,7 +41,6 @@ import org.eclipse.osee.framework.ui.skynet.XFormToolkit; import org.eclipse.osee.framework.ui.skynet.artifact.annotation.AnnotationComposite; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.HtmlDialog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPage; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; @@ -126,7 +126,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { smaMgr.getSma().getHelpContext()); } catch (Exception ex) { - OSEELog.logException(getClass(), ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -349,7 +349,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { try { AtsLib.editActionActionableItems(teamWf.getParentActionArtifact()); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -402,7 +402,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { try { AtsLib.editTeamActionableItems(teamWf); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -552,7 +552,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable { smaMgr.getEditor().onDirtied(); } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java index fa8df82159d..4f768cd3f97 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddNoteOperation.java @@ -18,9 +18,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.actions.wizard.NewNoteWizard; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact.DefaultTeamState; import org.eclipse.osee.ats.editor.SMAManager; +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.ui.skynet.ats.NoteType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition; import org.eclipse.ui.PlatformUI; @@ -79,7 +80,7 @@ public class AddNoteOperation extends WorkPageService { smaMgr.getEditor().onDirtied(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java index 70d4c1a2d3c..15dcd0d449b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/AddPeerToPeerReviewService.java @@ -20,9 +20,10 @@ import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.ats.util.widgets.dialog.StateListAndTitleDialog; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.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.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.forms.events.HyperlinkEvent; @@ -83,7 +84,7 @@ public class AddPeerToPeerReviewService extends WorkPageService { job.schedule(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java index f77d880f259..f968485adaa 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/BlockingReview.java @@ -16,8 +16,9 @@ import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; @@ -82,7 +83,7 @@ public class BlockingReview extends WorkPageService { SWT.COLOR_RED) : null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/DebugOperations.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/DebugOperations.java index 8cc9f76f938..6111a286051 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/DebugOperations.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/DebugOperations.java @@ -18,11 +18,12 @@ import org.eclipse.osee.ats.editor.stateItem.AtsDebugWorkPage; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts.OpenView; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.forms.events.HyperlinkEvent; @@ -98,7 +99,7 @@ public class DebugOperations extends WorkPageService { else AtsLib.open(hrid, OpenView.ArtifactEditor); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -119,7 +120,7 @@ public class DebugOperations extends WorkPageService { AtsLib.open(((TeamWorkFlowArtifact) smaMgr.getSma()).getTeamDefinition().getGuid(), OpenView.ArtifactEditor); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java index 503ee4d241d..4f4c6b776bb 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/EmailActionService.java @@ -16,7 +16,8 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.util.ArtifactEmailWizard; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.swt.widgets.Display; /** @@ -45,7 +46,7 @@ public class EmailActionService extends WorkPageService { try { performEmail(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java index 932a4f89444..795273436d5 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenInAtsWorldOperation.java @@ -20,7 +20,8 @@ import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; /** * @author Donald G. Dunne @@ -47,9 +48,10 @@ public class OpenInAtsWorldOperation extends WorkPageService { Arrays.asList(smaMgr.getSma()))); return; } - OSEELog.logSevere(AtsPlugin.class, "Unhandled artifact type " + smaMgr.getSma().getArtifactTypeName(), true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, + "Unhandled artifact type " + smaMgr.getSma().getArtifactTypeName()); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java index a359fde1e5e..a9057d8c065 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenLatestVersion.java @@ -17,11 +17,12 @@ import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.forms.events.HyperlinkEvent; @@ -64,7 +65,7 @@ public class OpenLatestVersion extends WorkPageService { Artifact art = ArtifactQuery.getArtifactFromId(smaMgr.getSma().getGuid(), smaMgr.getSma().getBranch()); AtsLib.openAtsAction(art, AtsOpenOption.OpenOneOrPopupSelect); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java index 5d8f1441744..bc58162e3c9 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenTeamDefinition.java @@ -16,8 +16,9 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.util.AtsLib; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -33,7 +34,7 @@ public class OpenTeamDefinition extends WorkPageService { AtsLib.openAtsAction(((TeamWorkFlowArtifact) smaMgr.getSma()).getTeamDefinition(), AtsOpenOption.OpenOneOrPopupSelect); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java index c20aa03ffa3..218fcad8efe 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/OpenVersionArtifact.java @@ -16,9 +16,9 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -73,7 +73,7 @@ public class OpenVersionArtifact extends WorkPageService { try { enabled = ((TeamWorkFlowArtifact) smaMgr.getSma()).getWorldViewTargetedVersion() != null; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } action.setEnabled(enabled); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java index 1bd5fb9e408..48921c345ec 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/PrivilegedEditService.java @@ -19,10 +19,11 @@ import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; @@ -97,7 +98,7 @@ public class PrivilegedEditService extends WorkPageService { SMAEditor.PriviledgedEditMode.Global); } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java index 4256214f6fd..c316b659ab9 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ServicesArea.java @@ -32,9 +32,9 @@ import org.eclipse.osee.ats.editor.service.branch.ShowMergeManagerService; import org.eclipse.osee.ats.editor.service.branch.ShowWorkingBranchService; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -158,7 +158,7 @@ public class ServicesArea { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java index 6090bdba409..5220ab56fdf 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/ShowNotesOperation.java @@ -15,10 +15,11 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.util.Overview; 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.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; /** @@ -43,7 +44,7 @@ public class ShowNotesOperation extends WorkPageService { ResultsEditor.open(new XResultPage(title + " - " + XDate.getDateNow(XDate.MMDDYYHHMM), logOver.getPage(), Manipulations.HTML_MANIPULATIONS)); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateEstimatedHoursStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateEstimatedHoursStat.java index 35dbcbbdca6..5157007bba8 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateEstimatedHoursStat.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateEstimatedHoursStat.java @@ -20,9 +20,9 @@ import org.eclipse.osee.ats.editor.stateItem.AtsDebugWorkPage; import org.eclipse.osee.ats.editor.stateItem.AtsLogWorkPage; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; @@ -74,7 +74,7 @@ public class StateEstimatedHoursStat extends WorkPageService { try { if (smaMgr.promptChangeFloatAttribute(ATSAttributes.ESTIMATED_HOURS_ATTRIBUTE, false)) section.refreshStateServices(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateHoursSpentStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateHoursSpentStat.java index ec03540d542..9e0c70ca419 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateHoursSpentStat.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StateHoursSpentStat.java @@ -19,9 +19,9 @@ import org.eclipse.osee.ats.editor.stateItem.AtsDebugWorkPage; import org.eclipse.osee.ats.editor.stateItem.AtsLogWorkPage; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; @@ -73,7 +73,7 @@ public class StateHoursSpentStat extends WorkPageService { try { if (smaMgr.promptChangeStatus(false)) section.refreshStateServices(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StatePercentCompleteStat.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StatePercentCompleteStat.java index 387fb4241ac..3758ccb7b00 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StatePercentCompleteStat.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/StatePercentCompleteStat.java @@ -17,9 +17,9 @@ import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.forms.events.HyperlinkEvent; @@ -68,7 +68,7 @@ public class StatePercentCompleteStat extends WorkPageService { try { if (smaMgr.promptChangeStatus(false)) section.refreshStateServices(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java index 0a75f8e7dfc..ad89b18523c 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/TargetedForVersionState.java @@ -19,9 +19,9 @@ import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.editor.SMAWorkFlowSection; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; @@ -91,7 +91,7 @@ public class TargetedForVersionState extends WorkPageService { section.refreshStateServices(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java index b21ff378c1c..a116a29ebc4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java @@ -18,13 +18,14 @@ import org.eclipse.osee.ats.editor.service.WorkPageService; import org.eclipse.osee.ats.util.AtsBranchManager; import org.eclipse.osee.ats.workflow.AtsWorkPage; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.event.BranchEventType; import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.Sender; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.forms.events.HyperlinkEvent; @@ -76,7 +77,7 @@ public class CommitWorkingBranchService extends WorkPageService implements IBran try { smaMgr.getBranchMgr().commitWorkingBranch(true, overrideStateValidation); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java index a0331c9cf38..583529d36e8 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateChangeReports.java @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.jdk.core.util.AXml;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.IHealthStatus;
+import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
import org.eclipse.osee.framework.skynet.core.SkynetActivator;
@@ -51,7 +52,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor;
import org.eclipse.osee.framework.ui.skynet.results.XResultData;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
@@ -235,7 +235,7 @@ public class ValidateChangeReports extends XNavigateItemAction { postPage));
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java index 8b6e207202b..eaf4c64cd96 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java @@ -21,6 +21,7 @@ import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.SkynetActivator; import org.eclipse.osee.framework.skynet.core.User; @@ -34,7 +35,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.skywalker.SkyWalkerOptions; import org.eclipse.osee.framework.ui.skynet.skywalker.SkyWalkerView; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IEditorPart; @@ -132,8 +132,9 @@ public class ActionSkyWalker extends SkyWalkerView implements IPartListener, IAc if (parentArtifact instanceof StateMachineArtifact) { if (parentArtifact instanceof TeamWorkFlowArtifact) artifact = ((TeamWorkFlowArtifact) parentArtifact).getParentActionArtifact(); - else - OSEELog.logSevere(AtsPlugin.class, "Unknown parent " + art.getHumanReadableId(), true); + else { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Unknown parent " + art.getHumanReadableId()); + } } } return artifact; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java index ab13014ba42..7623b56df6b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/HyperView.java @@ -43,12 +43,12 @@ import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.framework.db.connection.OseeDbConnection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException;
+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.OseeContributionItem;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -695,7 +695,7 @@ public class HyperView extends ViewPart implements IPartListener { try {
handleItemDoubleClick(si);
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -774,7 +774,7 @@ public class HyperView extends ViewPart implements IPartListener { try {
art.delete();
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java index bf574571a00..e3ea5962004 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateComposite.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ats.navigate;
import java.util.Collection;
-
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.task.TaskEditor;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java index 87f297d71c6..e98eb81ab5d 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java @@ -54,13 +54,13 @@ import org.eclipse.osee.ats.world.search.VersionTargetedForTeamSearchItem; import org.eclipse.osee.ats.world.search.MyReviewWorkflowItem.ReviewState; import org.eclipse.osee.ats.world.search.WorldSearchItem.LoadView; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.skynet.blam.BlamOperations; import org.eclipse.osee.framework.ui.skynet.blam.operation.BlamOperation; import org.eclipse.osee.framework.ui.skynet.util.EmailGroupsAndUserGroups; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.EmailGroupsAndUserGroups.GroupType; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; @@ -243,7 +243,9 @@ public class AtsNavigateViewItems extends XNavigateViewItems { public void addExtensionPointItems(List<XNavigateItem> items) { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.ats.AtsNavigateItem"); - if (point == null) OSEELog.logSevere(AtsPlugin.class, "Can't access AtsNavigateItem extension point", true); + if (point == null) { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access AtsNavigateItem extension point"); + } IExtension[] extensions = point.getExtensions(); Map<String, XNavigateItem> nameToNavItem = new HashMap<String, XNavigateItem>(); for (IExtension extension : extensions) { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java index 89eb457eb9c..952679af174 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateNewVersionItem.java @@ -18,12 +18,13 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +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.skynet.core.artifact.search.Active; 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.artifact.editor.ArtifactEditor; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; @@ -81,7 +82,7 @@ public class CreateNewVersionItem extends XNavigateItemAction { createNewVersionItemTx(transaction, teamDefHoldingVersions, newVer); transaction.execute(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java index 83697c928bb..21e7eb488ff 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/FirstTimeQualityMetricReportItem.java @@ -29,12 +29,13 @@ import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.search.Active; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; @@ -79,7 +80,7 @@ public class FirstTimeQualityMetricReportItem extends XNavigateItemAction { try { ld.setInput(TeamDefinitionArtifact.getTeamReleaseableDefinitions(Active.Both)); } catch (MultipleAttributesExist ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } int result = ld.open(); if (result == 0) { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java index 9cb5dec7146..c47f7add7d5 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/GenerateFullVersionReportItem.java @@ -24,10 +24,11 @@ import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; @@ -85,7 +86,7 @@ public class GenerateFullVersionReportItem extends XNavigateItemAction { try { ld.setInput(TeamDefinitionArtifact.getTeamReleaseableDefinitions(Active.Active)); } catch (MultipleAttributesExist ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } int result = ld.open(); if (result == 0) { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java index bbe954782ca..3a41312bcdf 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/MassEditTeamVersionItem.java @@ -18,10 +18,11 @@ import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; @@ -75,7 +76,7 @@ public class MassEditTeamVersionItem extends XNavigateItemAction { try { ld.setInput(TeamDefinitionArtifact.getTeamReleaseableDefinitions(Active.Active)); } catch (MultipleAttributesExist ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } int result = ld.open(); if (result == 0) { @@ -96,7 +97,7 @@ public class MassEditTeamVersionItem extends XNavigateItemAction { MassArtifactEditor.editArtifacts(getName(), teamDef.getTeamDefinitionHoldingVersions().getVersionsArtifacts()); selectedTeamDef = null; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java index 43140baf9b9..e6dd3e81cc7 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NavigateView.java @@ -22,6 +22,7 @@ import org.eclipse.osee.ats.world.search.MultipleHridSearchItem; import org.eclipse.osee.ats.world.search.MyWorldSearchItem; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +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.ui.skynet.OseeContributionItem; @@ -29,7 +30,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.swt.SWT; @@ -123,7 +123,7 @@ public class NavigateView extends ViewPart implements IActionable { xNavComp.handleDoubleClick(new SearchNavigateItem(null, new MyWorldSearchItem("My World", UserManager.getUser())), TableLoadOption.None); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -158,7 +158,7 @@ public class NavigateView extends ViewPart implements IActionable { xNavComp.handleDoubleClick(new SearchNavigateItem(null, new MultipleHridSearchItem()), TableLoadOption.None); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -172,7 +172,7 @@ public class NavigateView extends ViewPart implements IActionable { try { xNavComp.handleDoubleClick(new OpenChangeReportByIdItem(null), TableLoadOption.None); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java index 979a31d7391..27ca04e4985 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/NewPeerToPeerReviewItem.java @@ -17,11 +17,12 @@ import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.ats.util.widgets.ReviewManager; import org.eclipse.osee.ats.util.widgets.dialog.ActionableItemListDialog; +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.search.Active; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; @@ -62,7 +63,7 @@ public class NewPeerToPeerReviewItem extends XNavigateItemAction { AtsLib.openAtsAction(peerArt, AtsOpenOption.OpenAll); transaction.execute(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/OpenChangeReportByIdItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/OpenChangeReportByIdItem.java index 89d9109ece4..048ce39f5f1 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/OpenChangeReportByIdItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/OpenChangeReportByIdItem.java @@ -14,6 +14,7 @@ package org.eclipse.osee.ats.navigate; import java.util.Collection; import java.util.HashSet; import java.util.Set; +import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -26,10 +27,11 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.world.search.MultipleHridSearchItem; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.db.connection.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.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Jobs; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; @@ -101,7 +103,7 @@ public class OpenChangeReportByIdItem extends XNavigateItemAction { }); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, false); + OseeLog.log(AtsPlugin.class, Level.SEVERE, ex); return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); } return Status.OK_STATUS; @@ -109,7 +111,7 @@ public class OpenChangeReportByIdItem extends XNavigateItemAction { }; Jobs.startJob(openJob); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java index 5edbe2a3fca..09a4ce6e190 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/ReleaseVersionItem.java @@ -23,10 +23,11 @@ import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.framework.db.connection.exception.MultipleAttributesExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +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.search.Active; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemAction; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; @@ -67,8 +68,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { VersionArtifact verArt = (VersionArtifact) ld.getResult()[0]; // Validate team lead status - if (!AtsPlugin.isAtsAdmin() && !verArt.getParentTeamDefinition().getLeads().contains( - UserManager.getUser())) { + if (!AtsPlugin.isAtsAdmin() && !verArt.getParentTeamDefinition().getLeads().contains(UserManager.getUser())) { AWorkbench.popup("ERROR", "Only lead can release version."); return; } @@ -108,7 +108,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Error releasing version", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error releasing version"); } } @@ -118,7 +118,7 @@ public class ReleaseVersionItem extends XNavigateItemAction { try { ld.setInput(TeamDefinitionArtifact.getTeamReleaseableDefinitions(Active.Active)); } catch (MultipleAttributesExist ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } int result = ld.open(); if (result == 0) { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java index a2d579730fb..ce16fc44270 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/TeamWorkflowSearchWorkflowSearchItem.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.navigate; import java.util.Collection;
import java.util.Set;
-
+import java.util.logging.Level;
import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
import org.eclipse.osee.ats.artifact.VersionArtifact;
@@ -17,11 +17,12 @@ import org.eclipse.osee.ats.world.WorldEditorParameterSearchItem; import org.eclipse.osee.ats.world.search.TeamWorldSearchItem;
import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
import org.eclipse.osee.framework.ui.skynet.widgets.XCombo;
import org.eclipse.osee.framework.ui.skynet.widgets.XMembersCombo;
@@ -163,7 +164,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe }
versionCombo.setDataStrings(names.toArray(new String[names.size()]));
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -177,16 +178,16 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe }
public void setSelectedUser(User user) {
- if (assigneeCombo != null) assigneeCombo.set(user);
+ if (assigneeCombo != null) assigneeCombo.set(user);
}
private boolean isIncludeCompletedCancelledCheckbox() {
if (includeCompletedCancelledCheckbox == null) return false;
return includeCompletedCancelledCheckbox.isSelected();
}
-
- public void includeCompletedCancelledCheckbox (boolean selected) {
- if (includeCompletedCancelledCheckbox != null) includeCompletedCancelledCheckbox.set(selected);
+
+ public void includeCompletedCancelledCheckbox(boolean selected) {
+ if (includeCompletedCancelledCheckbox != null) includeCompletedCancelledCheckbox.set(selected);
}
private VersionArtifact getSelectedVersionArtifact() throws OseeCoreException {
@@ -205,14 +206,14 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe }
return null;
}
-
- public void setVersion (String versionStr) {
- if (versionCombo != null && versionCombo.getInDataStrings() != null) {
- // should check if the version combo was populated
- if (versionCombo.getInDataStrings().length > 0) {
- versionCombo.set(versionStr);
- }
- }
+
+ public void setVersion(String versionStr) {
+ if (versionCombo != null && versionCombo.getInDataStrings() != null) {
+ // should check if the version combo was populated
+ if (versionCombo.getInDataStrings().length > 0) {
+ versionCombo.set(versionStr);
+ }
+ }
}
public Collection<TeamDefinitionArtifact> getSelectedTeamDefinitions() throws OseeCoreException {
@@ -220,14 +221,13 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe return teamCombo.getSelectedTeamDefintions();
}
-
public void setSelectedTeamDefinitions(Set<TeamDefinitionArtifact> selectedUsers) {
- if (teamCombo != null){
- teamCombo.setSelectedTeamDefs(selectedUsers);
- teamCombo.notifyXModifiedListeners();
+ if (teamCombo != null) {
+ teamCombo.setSelectedTeamDefs(selectedUsers);
+ teamCombo.notifyXModifiedListeners();
}
}
-
+
private ReleasedOption getSelectedReleased() throws OseeCoreException {
if (releasedCombo == null || releasedCombo.get() == null || releasedCombo.get().equals("")) {
return ReleasedOption.Both;
@@ -284,7 +284,7 @@ public class TeamWorkflowSearchWorkflowSearchItem extends WorldEditorParameterSe }
return Result.TrueResult;
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, false);
+ OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
return new Result("Exception: " + ex.getLocalizedMessage());
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java index c1ce9785fb4..915520c9fe7 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSimpleList.java @@ -23,6 +23,8 @@ import org.eclipse.osee.ats.artifact.TaskableStateMachineArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; @@ -30,7 +32,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.blam.operation.AbstractBlam; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XListDropViewer; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; @@ -89,13 +90,13 @@ public class ImportTasksFromSimpleList extends AbstractBlam { teamArt.persistAttributesAndRelations(transaction); transaction.execute(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return; } SMAEditor.editArtifact(artifact); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } }; }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java index 0661f8198ab..c421affa33d 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java @@ -22,13 +22,14 @@ import org.eclipse.osee.ats.editor.SMAEditor; import org.eclipse.osee.ats.util.Import.ExcelAtsTaskArtifactExtractor; import org.eclipse.osee.ats.util.Import.TaskImportJob; import org.eclipse.osee.framework.db.connection.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.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Jobs; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.blam.operation.AbstractBlam; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XListDropViewer; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; @@ -134,13 +135,13 @@ public class ImportTasksFromSpreadsheet extends AbstractBlam { Jobs.startJob(new TaskImportJob(file, new ExcelAtsTaskArtifactExtractor( (TeamWorkFlowArtifact) artifact, emailPocs, persist))); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return; } SMAEditor.editArtifact(artifact); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } }; }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java index b4936ff53b3..944c3fa6288 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java @@ -18,6 +18,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; @@ -28,7 +30,6 @@ import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.blam.operation.AbstractBlam; import org.eclipse.osee.framework.ui.skynet.notify.OseeNotificationManager; import org.eclipse.osee.framework.ui.skynet.util.ArtifactTypeAndDescriptiveLabelProvider; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactCheckTreeDialog; /** @@ -95,7 +96,7 @@ public class ReAssignATSObjectsToUser extends AbstractBlam { transaction.execute(); OseeNotificationManager.sendNotifications(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } }; }); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/ExtendedStatusReportJob.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/ExtendedStatusReportJob.java index d9a0d88e76d..2d5909d49df 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/ExtendedStatusReportJob.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/report/ExtendedStatusReportJob.java @@ -27,6 +27,7 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.utility.Artifacts; @@ -34,7 +35,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.results.ResultsEditor; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage; import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; /** @@ -178,7 +178,8 @@ public class ExtendedStatusReportJob extends Job { values.add(desc); } else if (col == Columns.Originator) { if (smaMgr.getOriginator() == null) { - OSEELog.logSevere(AtsPlugin.class, "Can't retrieve orig for " + sma.getHumanReadableId(), true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, + "Can't retrieve orig for " + sma.getHumanReadableId()); values.add("."); } else values.add(smaMgr.getOriginator().getName()); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java index 656e3499f10..fbe61860fbe 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskComposite.java @@ -36,8 +36,8 @@ import org.eclipse.osee.ats.world.WorldContentProvider; import org.eclipse.osee.ats.world.WorldLabelProvider; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.SkynetActivator; 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.ArtifactTransfer; @@ -50,7 +50,6 @@ import org.eclipse.osee.framework.ui.skynet.blam.BlamEditor; import org.eclipse.osee.framework.ui.skynet.blam.BlamOperations; import org.eclipse.osee.framework.ui.skynet.blam.operation.BlamOperation; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.swt.ALayout; @@ -176,7 +175,7 @@ public class TaskComposite extends Composite implements IActionable { setupDragAndDropSupport(); parent.layout(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -248,7 +247,7 @@ public class TaskComposite extends Composite implements IActionable { provider.setTableLoadOptions(TableLoadOption.NoUI); TaskEditor.open(provider); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -268,7 +267,7 @@ public class TaskComposite extends Composite implements IActionable { TaskEditor.open(new TaskEditorSimpleProvider("Tasks", taskXViewer.getSelectedArtifacts(), taskXViewer.getCustomizeMgr().generateCustDataFromTable())); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -286,7 +285,7 @@ public class TaskComposite extends Composite implements IActionable { loadTable(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -338,7 +337,7 @@ public class TaskComposite extends Composite implements IActionable { try { updateExtraInfoLine(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -365,7 +364,7 @@ public class TaskComposite extends Composite implements IActionable { try { handleImportTasksViaSpreadsheet(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -379,13 +378,13 @@ public class TaskComposite extends Composite implements IActionable { try { handleImportTasksViaList(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -439,7 +438,7 @@ public class TaskComposite extends Composite implements IActionable { } transaction.execute(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -456,7 +455,7 @@ public class TaskComposite extends Composite implements IActionable { taskXViewer.add(taskArt); taskXViewer.getTree().setFocus(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } return taskArt; @@ -577,7 +576,7 @@ public class TaskComposite extends Composite implements IActionable { } transaction.execute(); } catch (Exception ex) { - OSEELog.logException(SkynetActivator.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java index 8084fa8cbf0..b7e70a151b5 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskEditor.java @@ -15,7 +15,6 @@ import java.util.Collection; import java.util.HashSet;
import java.util.List;
import java.util.logging.Level;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -31,6 +30,7 @@ import org.eclipse.osee.ats.world.IAtsMetricsProvider; import org.eclipse.osee.ats.world.WorldEditorParameterSearchItemProvider;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.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.skynet.core.transaction.SkynetTransaction;
@@ -39,7 +39,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.OseeContributionItem;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
import org.eclipse.swt.SWT;
@@ -73,7 +72,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit }
transaction.execute();
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
onDirtied();
}
@@ -255,7 +254,7 @@ public class TaskEditor extends AbstractArtifactEditor implements IDirtiableEdit try {
page.openEditor(new TaskEditorInput(provider), EDITOR_ID);
} catch (PartInitException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}, (provider.getTableLoadOptions() != null && provider.getTableLoadOptions().contains(TableLoadOption.ForcePend)));
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java index 37fd660243a..9b4ee3fd79e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXViewer.java @@ -31,6 +31,7 @@ import org.eclipse.osee.ats.world.WorldXViewer; import org.eclipse.osee.ats.world.WorldXViewerFactory; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.Artifact; import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData; @@ -40,7 +41,6 @@ import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.TreeColumn; @@ -163,7 +163,7 @@ public class TaskXViewer extends WorldXViewer { update(getSelectedTaskArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -177,7 +177,7 @@ public class TaskXViewer extends WorldXViewer { update(getSelectedTaskArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -191,7 +191,7 @@ public class TaskXViewer extends WorldXViewer { update(getSelectedTaskArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -202,7 +202,7 @@ public class TaskXViewer extends WorldXViewer { try { handleChangeResolution(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -220,7 +220,7 @@ public class TaskXViewer extends WorldXViewer { update(getSelectedTaskArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -237,7 +237,7 @@ public class TaskXViewer extends WorldXViewer { update(getSelectedTaskArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -254,7 +254,7 @@ public class TaskXViewer extends WorldXViewer { update(getSelectedTaskArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -272,7 +272,7 @@ public class TaskXViewer extends WorldXViewer { try { xTaskViewer.handleDeleteTask(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -372,7 +372,7 @@ public class TaskXViewer extends WorldXViewer { return true; } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXWidgetActionPage.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXWidgetActionPage.java index e35b077fd33..c8769f171d9 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXWidgetActionPage.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/task/TaskXWidgetActionPage.java @@ -8,9 +8,10 @@ package org.eclipse.osee.ats.task; import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.world.AtsXWidgetActionFormPage;
import org.eclipse.osee.framework.db.connection.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.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.IDynamicWidgetLayoutListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -105,7 +106,7 @@ public class TaskXWidgetActionPage extends AtsXWidgetActionFormPage { try {
reSearch();
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java index e3c5b1e0705..cd371885056 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchManager.java @@ -46,6 +46,7 @@ import org.eclipse.osee.framework.db.connection.exception.MultipleBranchesExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.db.connection.exception.OseeStateException;
import org.eclipse.osee.framework.db.connection.exception.TransactionDoesNotExist;
+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.skynet.core.access.AccessControlData;
@@ -69,7 +70,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.branch.BranchView;
import org.eclipse.osee.framework.ui.skynet.branch.CommitHandler;
import org.eclipse.osee.framework.ui.skynet.dialogs.ListDialogSortable;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.TransactionIdLabelProvider;
import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkRuleDefinition;
@@ -100,7 +100,7 @@ public class AtsBranchManager { }
BranchManager.setDefaultBranch(getWorkingBranch());
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -125,7 +125,7 @@ public class AtsBranchManager { MergeView.openView(transactionId);
}
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -140,7 +140,7 @@ public class AtsBranchManager { }
BranchView.revealBranch(getWorkingBranch());
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -169,7 +169,7 @@ public class AtsBranchManager { AWorkbench.popup("Delete Complete", "Deleted Branch Successfully");
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, "Problem deleting branch.", ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Problem deleting branch.");
}
}
@@ -247,7 +247,7 @@ public class AtsBranchManager { AWorkbench.popup("ERROR", "No Branch or Committed Transaction Found.");
}
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, "Can't show change report.", ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't show change report.", ex);
}
}
@@ -263,7 +263,7 @@ public class AtsBranchManager { } else
CommitManagerView.openViewUpon((IBranchArtifact) smaMgr.getSma());
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java index 2c6daa73186..28a487cc732 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsLib.java @@ -38,6 +38,7 @@ import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AFile; 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.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.Branch; @@ -53,7 +54,6 @@ import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption; import org.eclipse.osee.framework.ui.skynet.ats.IAtsLib; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; @@ -190,7 +190,7 @@ public class AtsLib implements IAtsLib { Artifact artifact = ArtifactQuery.getArtifactFromId(guidOrHrid, branch); openAtsAction(artifact, AtsOpenOption.OpenOneOrPopupSelect); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -205,7 +205,7 @@ public class AtsLib implements IAtsLib { try { artifact = ArtifactQuery.getArtifactFromId(guid, AtsPlugin.getAtsBranch()); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return; } @@ -235,7 +235,7 @@ public class AtsLib implements IAtsLib { "Actionable Item \"" + actionableItemName + "\" is not configured for ATS tracking.\n\nAction can not be created."); return; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return; } @@ -276,7 +276,7 @@ public class AtsLib implements IAtsLib { else return; } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -285,7 +285,7 @@ public class AtsLib implements IAtsLib { } else SMAEditor.editArtifact(art); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Favorites.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Favorites.java index 6558efb29f4..6cba530a8ad 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Favorites.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Favorites.java @@ -17,9 +17,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.IFavoriteableArtifact; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +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.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.ui.PlatformUI; /** @@ -70,7 +71,7 @@ public class Favorites { } } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportPage.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportPage.java index b52480768d1..9ce9625e8b1 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportPage.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ActionImportPage.java @@ -18,9 +18,10 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.world.WorldEditor; import org.eclipse.osee.ats.world.WorldEditorSimpleProvider; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.FileSelector; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -147,7 +148,7 @@ public class ActionImportPage extends WizardDataTransferPage { WorldEditor.open(new WorldEditorSimpleProvider("Imported Action Artifacts", extractor.getActionArts())); transaction.execute(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return true; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java index 8709ad46215..6b57804c959 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ExcelAtsActionArtifactExtractor.java @@ -30,6 +30,7 @@ import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelSaxHandler; import org.eclipse.osee.framework.jdk.core.util.io.xml.RowProcessor; +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.skynet.core.UserManager; @@ -38,7 +39,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.skynet.Import.AbstractArtifactExtractor; import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.eclipse.osee.framework.ui.skynet.util.ChangeType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderFactory; @@ -59,8 +59,8 @@ public class ExcelAtsActionArtifactExtractor extends AbstractArtifactExtractor i public static String getDescription() { return description; } - private Set<ActionData> actionDatas = new HashSet<ActionData>(); - private Set<ActionArtifact> actionArts = new HashSet<ActionArtifact>(); + private final Set<ActionData> actionDatas = new HashSet<ActionData>(); + private final Set<ActionArtifact> actionArts = new HashSet<ActionArtifact>(); public ExcelAtsActionArtifactExtractor(Branch branch, boolean emailPOCs) { super(branch); @@ -138,7 +138,7 @@ public class ExcelAtsActionArtifactExtractor extends AbstractArtifactExtractor i if (!str.equals("")) aData.assigneeStrs.add(str); } } else { - OSEELog.logSevere(AtsPlugin.class, "Unhandled column => " + headerRow[i], true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Unhandled column => " + headerRow[i]); } } actionDatas.add(aData); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Subscribe.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Subscribe.java index 59baf3de58d..4f775bcddae 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Subscribe.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Subscribe.java @@ -17,9 +17,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ISubscribableArtifact; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +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.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.ui.PlatformUI; /** @@ -74,7 +75,7 @@ public class Subscribe { } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java index 989dadd7c4d..b1a444a836c 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/ReviewManager.java @@ -31,13 +31,13 @@ import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.util.UsersByIds; import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -89,7 +89,7 @@ public class ReviewManager { return decRev; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return null; } @@ -207,7 +207,7 @@ public class ReviewManager { try { return smaMgr.getSma().getRelatedArtifactsCount(AtsRelation.TeamWorkflowToReview_Review) > 0; } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return false; } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java index 855002e867f..ccb63cef48e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/TaskManager.java @@ -23,12 +23,12 @@ import org.eclipse.osee.ats.artifact.TaskArtifact.TaskStates; import org.eclipse.osee.ats.editor.SMAManager; import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.plugin.util.Result; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -62,7 +62,7 @@ public class TaskManager { try { return smaMgr.getSma().getRelatedArtifactsCount(AtsRelation.SmaToTask_Task) > 0; } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return false; } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java index 99843b9d2ef..1ecfd02a20e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/XHyperlabelTeamDefinitionSelection.java @@ -15,10 +15,11 @@ import java.util.HashSet; import java.util.Set;
import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact;
import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionTreeWithChildrenDialog;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.search.Active;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.XHyperlinkLabelSelection;
/**
@@ -80,7 +81,7 @@ public class XHyperlabelTeamDefinitionSelection extends XHyperlinkLabelSelection }
return true;
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return false;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectManager.java index 4d97844cdd9..2ccd627709a 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectManager.java @@ -14,16 +14,17 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.skynet.core.UserManager; 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.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; /** @@ -36,7 +37,7 @@ public class DefectManager { private static String ATS_DEFECT_TAG = "AtsDefect"; private static String DEFECT_ITEM_TAG = "Item"; private static String REVIEW_DEFECT_ATTRIBUTE_NAME = "ats.Review Defect"; - private Matcher defectMatcher = + private final Matcher defectMatcher = java.util.regex.Pattern.compile("<" + DEFECT_ITEM_TAG + ">(.*?)</" + DEFECT_ITEM_TAG + ">", Pattern.DOTALL | Pattern.MULTILINE).matcher(""); @@ -93,7 +94,7 @@ public class DefectManager { artifact.setSoleAttributeValue(REVIEW_DEFECT_ATTRIBUTE_NAME, sb.toString()); if (persist) artifact.persistAttributes(transaction); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Can't create ats review defect document", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't create ats review defect document", ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java index 75e2b88ee2e..fa6fef4229b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/DefectXViewer.java @@ -28,9 +28,10 @@ import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Disposition; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.InjectionActivity; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity; import org.eclipse.osee.framework.db.connection.exception.OseeStateException; +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.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.SkynetGuiDebug; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog; import org.eclipse.swt.events.DisposeEvent; @@ -176,7 +177,7 @@ public class DefectXViewer extends XViewer { return true; } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -284,7 +285,7 @@ public class DefectXViewer extends XViewer { return true; } } catch (Exception ex) { - OSEELog.logException(SkynetGuiDebug.class, ex, true); + OseeLog.log(SkynetGuiDebug.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java index 53bb307c26f..bca83f15a9c 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java @@ -25,6 +25,7 @@ import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Disposition; import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.event.FrameworkTransactionData; @@ -36,7 +37,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XDate; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; @@ -246,7 +246,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor xViewer.set(reviewArt.getDefectManager().getDefectItems()); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } refresh(); } @@ -270,7 +270,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor notifyXModifiedListeners(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -293,7 +293,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor deleteDefectHelper(items, persist, transaction); transaction.execute(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -307,7 +307,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor loadTable(); notifyXModifiedListeners(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -323,7 +323,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor notifyXModifiedListeners(); loadTable(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -385,7 +385,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor extraInfoLabel.setText(""); return Result.TrueResult; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); return new Result("Exception validating defects. See log for details. " + ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java index 5b86648911a..cdf5dd583fd 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AICheckTreeDialog.java @@ -19,11 +19,12 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.ArtifactLabelProvider; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEECheckedFilteredTreeDialog; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -69,12 +70,12 @@ public class AICheckTreeDialog extends OSEECheckedFilteredTreeDialog { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return comp; } @@ -88,7 +89,7 @@ public class AICheckTreeDialog extends OSEECheckedFilteredTreeDialog { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return super.isComplete(); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java index 98729d734dd..9ed45fcadd0 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/AITreeContentProvider.java @@ -18,9 +18,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class AITreeContentProvider implements ITreeContentProvider { @@ -52,7 +53,7 @@ public class AITreeContentProvider implements ITreeContentProvider { return ((ActionableItemArtifact) element).getParent(); } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return null; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java index 382dcf45fb5..92f0e0e9d79 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionActionableItemListDialog.java @@ -13,10 +13,11 @@ package org.eclipse.osee.ats.util.widgets.dialog; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -49,7 +50,7 @@ public class ActionActionableItemListDialog extends CheckedTreeSelectionDialog { try { setInput(ActionableItemArtifact.getTopLevelActionableItems(active)); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java index 45e9d66d4fe..083978b81a4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionTeamListDialog.java @@ -13,9 +13,10 @@ package org.eclipse.osee.ats.util.widgets.dialog; import java.util.ArrayList; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.ArtifactListDialog; import org.eclipse.swt.SWT; @@ -48,7 +49,7 @@ public class ActionTeamListDialog extends ArtifactListDialog { for (Artifact prod : TeamDefinitionArtifact.getTeamDefinitions(active)) arts.add(prod); } catch (Exception ex) { - OSEELog.logSevere(AtsPlugin.class, "Can't Load product list.", true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't Load product list."); } setArtifacts(arts); } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java index c706fc1563e..93925c704f6 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/ActionableItemListDialog.java @@ -14,10 +14,11 @@ import java.util.HashSet; import java.util.Set; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog; @@ -35,7 +36,7 @@ public class ActionableItemListDialog extends CheckedTreeSelectionDialog { try { setInput(ActionableItemArtifact.getTopLevelActionableItems(active)); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java index c3ecf167533..fb6b500766a 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/SMAStatusDialog.java @@ -15,8 +15,9 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.StateMachineArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.Result; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XFloat; import org.eclipse.osee.framework.ui.skynet.widgets.XPercent; import org.eclipse.osee.framework.ui.skynet.widgets.XRadioButton; @@ -84,7 +85,7 @@ public class SMAStatusDialog extends MessageDialog { try { if (smas.size() == 1) percent.set(smas.iterator().next().getSmaMgr().getStateMgr().getPercentComplete()); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } percent.addModifyListener(new ModifyListener() { public void modifyText(org.eclipse.swt.events.ModifyEvent e) { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskOptionStatusDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskOptionStatusDialog.java index c5792b6eed5..b1c58e3db5e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskOptionStatusDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TaskOptionStatusDialog.java @@ -20,8 +20,9 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.StateMachineArtifact; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.Result; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -93,7 +94,7 @@ public class TaskOptionStatusDialog extends SMAStatusDialog { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } resolutionCombo.getCombo().setVisibleItemCount(20); resolutionCombo.addSelectionListener(new SelectionListener() { diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java index 70fa74a298b..2c1f0f258b4 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamDefinitionTreeContentProvider.java @@ -18,9 +18,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class TeamDefinitionTreeContentProvider implements ITreeContentProvider { @@ -58,7 +59,7 @@ public class TeamDefinitionTreeContentProvider implements ITreeContentProvider { return ((TeamDefinitionArtifact) element).getParent(); } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return null; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java index f8b6e9f8616..c226bdb4995 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/dialog/TeamVersionListDialog.java @@ -16,11 +16,12 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.skynet.ArtifactViewerSorter; import org.eclipse.osee.framework.ui.skynet.util.ArtifactDescriptiveLabelProvider; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XComboViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -68,7 +69,7 @@ public class TeamVersionListDialog extends SelectionDialog { for (Artifact art : TeamDefinitionArtifact.getTeamReleaseableDefinitions(active)) objs.add((Object) art); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } Composite comp = new Composite(container, SWT.NONE); @@ -96,7 +97,7 @@ public class TeamVersionListDialog extends SelectionDialog { objs.add((Object) pda); versionCombo.setInput(objs); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } }; }); @@ -125,7 +126,7 @@ public class TeamVersionListDialog extends SelectionDialog { objs.add((Object) pda); versionCombo.setInput(objs); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleManager.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleManager.java index 235c8c97779..c3ac1d53142 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleManager.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleManager.java @@ -13,6 +13,7 @@ package org.eclipse.osee.ats.util.widgets.role; import java.util.HashSet; import java.util.Set; import java.util.regex.Matcher; +import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.IReviewArtifact; import org.eclipse.osee.ats.artifact.ReviewSMArtifact; import org.eclipse.osee.ats.editor.SMAManager; @@ -22,11 +23,11 @@ import org.eclipse.osee.ats.util.widgets.role.UserRole.Role; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; -import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -88,7 +89,7 @@ public class UserRoleManager { if (persist) artifact.persistAttributes(transaction); rollupHoursSpentToReviewState(persist, transaction); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Can't create ats review defect document", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't create ats review defect document", ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java index 1b9402172da..875a6e4b113 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/UserRoleXViewer.java @@ -22,10 +22,11 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.util.EnumStringSingleSelectionDialog; import org.eclipse.osee.ats.util.widgets.role.UserRole.Role; import org.eclipse.osee.framework.db.connection.exception.OseeStateException; +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.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.SkynetGuiDebug; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserListDialog; import org.eclipse.swt.events.DisposeEvent; @@ -195,7 +196,7 @@ public class UserRoleXViewer extends XViewer { return true; } } catch (Exception ex) { - OSEELog.logException(SkynetGuiDebug.class, ex, true); + OseeLog.log(SkynetGuiDebug.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java index 40efcdb73a8..6f0899c2ee3 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java @@ -23,6 +23,7 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.artifact.IReviewArtifact; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.event.FrameworkTransactionData; @@ -34,7 +35,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.swt.ALayout; @@ -209,7 +209,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IFramew xViewer.set(reviewArt.getUserRoleManager().getUserRoles()); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } refresh(); } @@ -233,7 +233,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IFramew removeUserRoleHelper(items, persist, transaction); transaction.execute(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -255,7 +255,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IFramew notifyXModifiedListeners(); loadTable(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/AtsWorkPage.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/AtsWorkPage.java index 0aa74b393d1..e66f3e6d7c9 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/AtsWorkPage.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/AtsWorkPage.java @@ -20,9 +20,10 @@ import org.eclipse.osee.ats.editor.service.WorkPageService; import org.eclipse.osee.ats.util.widgets.dialog.TaskResolutionOptionRule; import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; 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.DynamicXWidgetLayoutData; @@ -104,7 +105,7 @@ public class AtsWorkPage extends WorkPage { for (IAtsStateItem item : smaMgr.getStateItems().getStateItems(page.getId())) { Result result = item.xWidgetCreating(xWidget, toolkit, (AtsWorkPage) page, art, xModListener, isEditable); if (result.isFalse()) { - OSEELog.logSevere(AtsPlugin.class, "Error in page creation => " + result.getText(), true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error in page creation => " + result.getText()); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java index 8f0aaff861b..9c7310ea340 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigEditor.java @@ -40,6 +40,8 @@ import org.eclipse.osee.ats.workflow.editor.parts.ShapesEditPartFactory; import org.eclipse.osee.ats.workflow.editor.parts.ShapesTreeEditPartFactory;
import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException;
import org.eclipse.osee.framework.db.connection.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.skynet.core.event.FrameworkTransactionData;
import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
@@ -50,7 +52,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
import org.eclipse.swt.widgets.Composite;
@@ -88,7 +89,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im AWorkbench.getActivePage().openEditor(new AtsWorkflowConfigEditorInput(workflow),
AtsWorkflowConfigEditor.EDITOR_ID);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
@@ -181,7 +182,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im getCommandStack().markSaveLocation();
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -321,7 +322,7 @@ public class AtsWorkflowConfigEditor extends GraphicalEditorWithFlyoutPalette im }
}
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java index 166f5e9c999..d2afd504818 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/AtsWorkflowConfigRenderer.java @@ -13,10 +13,11 @@ package org.eclipse.osee.ats.workflow.editor; import java.util.List; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.framework.db.connection.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.render.DefaultArtifactRenderer; import org.eclipse.osee.framework.ui.skynet.render.PresentationType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition; import org.eclipse.swt.graphics.Image; @@ -56,7 +57,7 @@ public class AtsWorkflowConfigRenderer extends DefaultArtifactRenderer { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java index 63e76025eae..e7941ed6725 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/EditAction.java @@ -19,10 +19,11 @@ import org.eclipse.osee.ats.workflow.editor.model.WorkPageShape; import org.eclipse.osee.ats.workflow.editor.model.WorkflowDiagram;
import org.eclipse.osee.ats.workflow.editor.parts.DiagramEditPart;
import org.eclipse.osee.ats.workflow.editor.parts.WorkPageEditPart;
+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.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
@@ -97,7 +98,7 @@ public class EditAction extends Action { }
AWorkbench.popup("ERROR", "Can't locate corresponding artifact");
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java index 4c0a2109cb6..cf63b61d19e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/actions/ValidateDiagramTool.java @@ -14,9 +14,10 @@ import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.workflow.editor.model.ModelElement;
import org.eclipse.osee.ats.workflow.editor.parts.DiagramEditPart;
import org.eclipse.osee.framework.db.connection.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.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.events.MouseEvent;
/**
@@ -52,7 +53,7 @@ public class ValidateDiagramTool extends SelectionTool { }
}
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java index 4f2b6ae7752..de21831544d 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/model/WorkflowDiagram.java @@ -17,10 +17,11 @@ import java.util.Set; import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.workflow.item.AtsWorkDefinitions;
import org.eclipse.osee.framework.db.connection.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.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemAttributes;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
@@ -130,7 +131,7 @@ public class WorkflowDiagram extends ModelElement { }
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Result.TrueResult;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java index 5473cfc83da..291ad0cc291 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/AtsWorkflowConfigCreationWizard.java @@ -25,10 +25,11 @@ import org.eclipse.osee.ats.workflow.page.AtsCancelledWorkPageDefinition; import org.eclipse.osee.ats.workflow.page.AtsCompletedWorkPageDefinition;
import org.eclipse.osee.ats.workflow.page.AtsEndorseWorkPageDefinition;
import org.eclipse.osee.framework.db.connection.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.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkItemDefinitionFactory;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkPageDefinition;
@@ -85,7 +86,7 @@ public class AtsWorkflowConfigCreationWizard extends Wizard implements INewWizar AtsWorkflowConfigEditor.editWorkflow(workflow);
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return true;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java index faea9f60af0..56e1f6c2eb1 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/editor/wizard/NewWorkflowConfigPage1.java @@ -14,7 +14,8 @@ package org.eclipse.osee.ats.workflow.editor.wizard; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.workflow.ATSXWidgetOptionResolver; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; import org.eclipse.osee.framework.ui.skynet.widgets.XText; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; @@ -65,7 +66,7 @@ public class NewWorkflowConfigPage1 extends WizardPage { setControl(comp); ((XText) getXWidget("Namespace")).setFocus(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java index 16fcef4cd61..aec3e58b635 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workflow/vue/LoadAIsAndTeamsAction.java @@ -38,6 +38,7 @@ import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.db.connection.exception.UserNotInDatabase; 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.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; @@ -47,7 +48,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.WorkFlowDefinition; import org.eclipse.swt.widgets.Display; import org.osgi.framework.Bundle; @@ -106,7 +106,7 @@ public class LoadAIsAndTeamsAction { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.ats.AtsAIandTeamConfig"); if (point == null) { - OSEELog.logSevere(AtsPlugin.class, "Can't access AtsAIandTeamConfig extension point", true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access AtsAIandTeamConfig extension point"); return resources; } IExtension[] extensions = point.getExtensions(); @@ -125,7 +125,7 @@ public class LoadAIsAndTeamsAction { URL url = bundle.getEntry(vueFilename); resources.put(bundleName + "/" + vueFilename, Lib.inputStreamToString(url.openStream())); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Error loading AtsStateItem extension", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error loading AtsStateItem extension", ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItems.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItems.java index 6172f7c66ae..3f3e2174ba6 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItems.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsWorldEditorItems.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.ats.AtsPlugin; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.osgi.framework.Bundle; /** @@ -35,7 +35,7 @@ public class AtsWorldEditorItems { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.ats.AtsWorldEditorItem"); if (point == null) { - OSEELog.logSevere(AtsPlugin.class, "Can't access AtsWorldEditorItem extension point", true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access AtsWorldEditorItem extension point"); return; } IExtension[] extensions = point.getExtensions(); @@ -59,7 +59,8 @@ public class AtsWorldEditorItems { items.add((IAtsWorldEditorItem) obj); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, "Error loading AtsWorldEditorItem extension", ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, "Error loading AtsWorldEditorItem extension", + ex); } } } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java index 9de9d05342f..eda0605f79e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/AtsXWidgetActionFormPage.java @@ -14,12 +14,13 @@ import java.util.List; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.XFormToolkit; import org.eclipse.osee.framework.ui.skynet.XWidgetParser; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DefaultXWidgetOptionResolver; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData; @@ -104,7 +105,7 @@ public abstract class AtsXWidgetActionFormPage extends FormPage { } managedForm.addPart(new SectionPart(createResultsSection(body))); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -149,7 +150,7 @@ public abstract class AtsXWidgetActionFormPage extends FormPage { } parameterSection.setExpanded(true); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return parameterSection; diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldCompletedFilter.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldCompletedFilter.java index 21539ada4de..bc506ee3d43 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldCompletedFilter.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldCompletedFilter.java @@ -14,8 +14,9 @@ import java.util.regex.Pattern; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.osee.ats.AtsPlugin; +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.util.OSEELog; public class WorldCompletedFilter extends ViewerFilter { @@ -32,7 +33,7 @@ public class WorldCompletedFilter extends ViewerFilter { return !p.matcher(((IWorldViewArtifact) art).getWorldViewState()).find(); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return true; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java index ad728f1ed88..1d0037d791b 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldComposite.java @@ -33,6 +33,7 @@ import org.eclipse.osee.ats.util.SMAMetrics; import org.eclipse.osee.ats.world.search.WorldSearchItem;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.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.skynet.core.event.FrameworkTransactionData;
@@ -45,7 +46,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Jobs; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.XDate;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.swt.SWT;
@@ -321,7 +321,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans provider.setTableLoadOptions(TableLoadOption.NoUI);
WorldEditor.open(provider);
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
};
@@ -341,7 +341,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans WorldEditor.open(new WorldEditorSimpleProvider("ATS World", worldXViewer.getSelectedArtifacts(),
worldXViewer.getCustomizeMgr().generateCustDataFromTable(), tableLoadOptions));
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
};
@@ -380,7 +380,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans try {
worldEditor.reSearch();
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
};
@@ -575,7 +575,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans }
});
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
}
@@ -610,7 +610,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans }
});
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
}
@@ -644,7 +644,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans }
});
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
}
@@ -678,7 +678,7 @@ public class WorldComposite extends ScrolledComposite implements IFrameworkTrans }
});
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java index c8e6e7576ca..c09b9bbbd7f 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditor.java @@ -20,6 +20,7 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.AtsLib; import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType; import org.eclipse.osee.framework.db.connection.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.plugin.util.AWorkbench; @@ -27,7 +28,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.skynet.OseeContributionItem; import org.eclipse.osee.framework.ui.skynet.artifact.editor.AbstractArtifactEditor; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -71,7 +71,7 @@ public class WorldEditor extends AbstractArtifactEditor implements IDirtiableEdi try { page.openEditor(new WorldEditorInput(provider), EDITOR_ID); } catch (PartInitException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }, forcePend); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java index f8ccc770dad..c350fdb2329 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorParameterSearchItemProvider.java @@ -7,7 +7,6 @@ package org.eclipse.osee.ats.world; import java.util.Collection;
import java.util.logging.Level;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java index 5fa5935165b..07c56c9a55e 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldEditorUISearchItemProvider.java @@ -7,7 +7,6 @@ package org.eclipse.osee.ats.world; import java.util.Collection;
import java.util.logging.Level;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java index 05cce8447b6..8c68ae11bee 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldViewDragAndDrop.java @@ -17,13 +17,14 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.world.search.GroupWorldSearchItem;
+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.ArtifactData;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTransfer;
import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
import org.eclipse.osee.framework.ui.plugin.util.Jobs;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption;
import org.eclipse.swt.dnd.DND;
@@ -120,7 +121,7 @@ public class WorldViewDragAndDrop extends SkynetDragAndDrop { WorldEditor.open(new WorldEditorSimpleProvider(name, arts));
}
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
return new Status(Status.ERROR, AtsPlugin.PLUGIN_ID, ex.getLocalizedMessage(), ex);
}
return Status.OK_STATUS;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java index 00780061f6f..a469f9636c5 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java @@ -54,6 +54,7 @@ import org.eclipse.osee.ats.util.Favorites; import org.eclipse.osee.ats.util.Subscribe; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.artifact.ArtifactPersistenceManager; @@ -75,7 +76,6 @@ import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEditor; import org.eclipse.osee.framework.ui.skynet.ats.AtsOpenOption; import org.eclipse.osee.framework.ui.skynet.results.XResultData; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.HtmlDialog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerAttributeColumn; @@ -232,7 +232,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen update(getSelectedSMAArtifacts().toArray(), null); } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -245,7 +245,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen update(getSelectedSMAArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -260,7 +260,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen update(getSelectedSMAArtifacts().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -292,7 +292,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen update(getSelectedArtifactItems().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -307,7 +307,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen update(getSelectedArtifactItems().toArray(), null); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -326,7 +326,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen refresh(getSelectedArtifactItems().toArray()[0]); } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -340,7 +340,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen if (result.isFalse() && !result.getText().equals("")) result.popup(result.isTrue()); refresh(getSelectedArtifactItems().iterator().next()); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -385,7 +385,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen try { page.openEditor(worldEditorInput, WorldEditor.EDITOR_ID); } catch (PartInitException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -401,7 +401,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen try { TaskEditor.open(new TaskEditorSimpleProvider("ATS Tasks", getSelectedTaskArtifacts())); } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -425,8 +425,9 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen public void run() { if (getSelectedArtifacts().size() > 0) ArtifactEditor.editArtifact(getSelectedArtifactItems().iterator().next()); - else - OSEELog.logException(AtsPlugin.class, new Exception("Can't retrieve SMA"), true); + else { + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, new Exception("Can't retrieve SMA")); + } } }; @@ -443,7 +444,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen try { handleEmailSelectedAtsObject(); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; @@ -506,7 +507,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen ArtifactPromptChange.promptChangeAttribute(attrName, xCol.getName(), useArts, persist); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -910,7 +911,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -956,7 +957,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen } } } catch (OseeCoreException ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -1022,7 +1023,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen return true; } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java index 118415f92f4..2fb4e0e83f6 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXWidgetActionPage.java @@ -8,9 +8,10 @@ package org.eclipse.osee.ats.world; import org.eclipse.osee.ats.AtsPlugin;
import org.eclipse.osee.ats.world.search.WorldSearchItem.SearchType;
import org.eclipse.osee.framework.db.connection.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.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.workflow.IDynamicWidgetLayoutListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -68,7 +69,7 @@ public class WorldXWidgetActionPage extends AtsXWidgetActionFormPage { try {
worldEditor.getWorldEditorProvider().run(worldEditor, SearchType.Search, false);
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -113,7 +114,7 @@ public class WorldXWidgetActionPage extends AtsXWidgetActionFormPage { try {
reSearch();
} catch (OseeCoreException ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchItem.java index 578190c75e5..1628b030d60 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/MultipleHridSearchItem.java @@ -24,13 +24,14 @@ import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.util.LegacyPCRActions; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryCheckDialog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.swt.widgets.Display; @@ -109,8 +110,8 @@ public class MultipleHridSearchItem extends WorldUISearchItem { if (isCancelled()) return EMPTY_SET; if (resultAtsArts.size() == 0 && resultNonAtsArts.size() == 0) { - OSEELog.logException(AtsPlugin.class, "Invalid HRID/Guid/Legacy PCR Id(s): " + Lib.getCommaString(ids), null, - true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, + "Invalid HRID/Guid/Legacy PCR Id(s): " + Lib.getCommaString(ids)); } if (resultNonAtsArts.size() > 0) { ArtifactEditor.editArtifacts(resultNonAtsArts); diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java index 99506a278d4..3d908894ca7 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/NextVersionSearchItem.java @@ -20,11 +20,11 @@ import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.util.AtsRelation; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.search.Active; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -109,7 +109,7 @@ public class NextVersionSearchItem extends WorldUISearchItem { } else cancelled = true; } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } cancelled = true; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java index 58bc9a75cc8..d80a210a190 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/TaskSearchWorldSearchItem.java @@ -26,13 +26,14 @@ import org.eclipse.osee.ats.world.search.TeamWorldSearchItem.ReleasedOption; import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
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.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
import org.eclipse.osee.framework.skynet.core.relation.RelationManager;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.plugin.util.Result;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.XCheckBox;
import org.eclipse.osee.framework.ui.skynet.widgets.XCombo;
import org.eclipse.osee.framework.ui.skynet.widgets.XHyperlabelGroupSelection;
@@ -294,7 +295,7 @@ public class TaskSearchWorldSearchItem extends TaskEditorParameterSearchItem { }
versionCombo.setDataStrings(names.toArray(new String[names.size()]));
} catch (Exception ex) {
- OSEELog.logException(AtsPlugin.class, ex, true);
+ OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java index 3ac9ac59f91..48da01bf9a7 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/VersionTargetedForTeamSearchItem.java @@ -21,9 +21,10 @@ import org.eclipse.osee.ats.artifact.VersionArtifact.VersionReleaseType; import org.eclipse.osee.ats.util.widgets.dialog.TeamDefinitionDialog; import org.eclipse.osee.ats.util.widgets.dialog.VersionListDialog; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.search.Active; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -105,7 +106,7 @@ public class VersionTargetedForTeamSearchItem extends WorldUISearchItem { } } } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } cancelled = true; } diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java index df59ef16331..1aa48ab8948 100644 --- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java +++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/search/WorldUISearchItem.java @@ -13,9 +13,10 @@ package org.eclipse.osee.ats.world.search; import java.util.Collection; import org.eclipse.osee.ats.AtsPlugin; import org.eclipse.osee.framework.db.connection.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.plugin.util.Displays; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -76,7 +77,7 @@ public abstract class WorldUISearchItem extends WorldSearchItem { try { performUI(searchType); } catch (Exception ex) { - OSEELog.logException(AtsPlugin.class, ex, true); + OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }, true); diff --git a/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java b/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java index 5f5dcf16003..b8fbf4de3e4 100644 --- a/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java +++ b/org.eclipse.osee.define/src/org/eclipse/osee/define/navigate/DefineNavigateViewItems.java @@ -20,12 +20,12 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.osee.define.DefinePlugin; import org.eclipse.osee.define.health.BranchCommitRegressionTest; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.BlamOperations; import org.eclipse.osee.framework.ui.skynet.blam.operation.BlamOperation; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItem; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateItemBlam; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateViewItems; @@ -45,6 +45,7 @@ public class DefineNavigateViewItems extends XNavigateViewItems { return navigateItems; } + @Override public List<XNavigateItem> getSearchNavigateItems() { List<XNavigateItem> items = new ArrayList<XNavigateItem>(); @@ -72,7 +73,9 @@ public class DefineNavigateViewItems extends XNavigateViewItems { public void addExtensionPointItems(List<XNavigateItem> items) { IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.define.DefineNavigateItem"); - if (point == null) OSEELog.logSevere(DefinePlugin.class, "Can't access DefineNavigateItem extension point", true); + if (point == null) { + OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Can't access DefineNavigateItem extension point"); + } IExtension[] extensions = point.getExtensions(); for (IExtension extension : extensions) { IConfigurationElement[] elements = extension.getConfigurationElements(); @@ -92,7 +95,7 @@ public class DefineNavigateViewItems extends XNavigateViewItems { IDefineNavigateItem task = (IDefineNavigateItem) obj; items.addAll(task.getNavigateItems()); } catch (Exception ex) { - OSEELog.logException(DefinePlugin.class, "Error loading DefineNavigateItem extension", ex, true); + OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Error loading DefineNavigateItem extension", ex); } } } diff --git a/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java b/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java index 17ca1d32743..b321939cc7e 100644 --- a/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java +++ b/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/ImportTraceabilityWizard.java @@ -13,9 +13,11 @@ package org.eclipse.osee.define.traceability; import java.io.File; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osee.define.DefinePlugin; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Branch; import org.eclipse.osee.framework.ui.plugin.util.Jobs; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; @@ -46,7 +48,7 @@ public class ImportTraceabilityWizard extends Wizard implements IImportWizard { File file = mainPage.getImportFile(); Jobs.startJob(new ImportTraceabilityJob(file, branch, true)); } catch (Exception ex) { - OSEELog.logException(getClass(), "Traceability Import Error", ex, true); + OseeLog.log(DefinePlugin.class, OseeLevel.SEVERE_POPUP, "Traceability Import Error", ex); } return true; } @@ -64,6 +66,7 @@ public class ImportTraceabilityWizard extends Wizard implements IImportWizard { /** * (non-Javadoc) Method declared on Wizard. */ + @Override public void addPages() { mainPage = new ImportTraceabilityPage(selection); addPage(mainPage); diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java index e6f49d6ed83..521e3c18c6c 100644 --- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java +++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java @@ -12,13 +12,13 @@ package org.eclipse.osee.framework.ui.admin; import java.util.ArrayList; import java.util.logging.Level; - import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType; @@ -31,7 +31,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Cursor; @@ -150,7 +149,7 @@ public class AdminView extends ViewPart implements IActionable { OseeEventManager.kickBroadcastEvent(this, BroadcastEventType.Message, new String[] {}, message); AWorkbench.popup("Success", "Message sent."); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -165,7 +164,7 @@ public class AdminView extends ViewPart implements IActionable { ClientSessionManager.getSession().toString()); AWorkbench.popup("Success", "Ping Sent"); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java index 171990a9afd..958291676db 100644 --- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java +++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java @@ -18,6 +18,8 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; @@ -25,7 +27,6 @@ import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.SelectionAdapter; @@ -153,7 +154,7 @@ public class OseeClientsTab { OseeEventManager.kickBroadcastEvent(this, BroadcastEventType.Force_Shutdown, selectedUsers, reason); AWorkbench.popup("Success", "Shutdown request sent."); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } else { @@ -183,7 +184,7 @@ public class OseeClientsTab { } } } catch (Exception ex) { - OSEELog.logException(AdminPlugin.class, ex, true); + OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return toReturn.toArray(new String[toReturn.size()]); } diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java index 895dfd35381..3b0a07a2542 100644 --- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java +++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbCellModifier.java @@ -12,11 +12,11 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import java.util.logging.Level; import org.eclipse.jface.viewers.ICellModifier; +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.skynet.core.UserManager; import org.eclipse.osee.framework.ui.admin.AdminPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.EnumeratedValue; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.StringValue; import org.eclipse.swt.widgets.TableItem; @@ -28,9 +28,9 @@ import org.eclipse.swt.widgets.TableItem; */ public class DbCellModifier implements ICellModifier { - private DbTableViewer dbTableViewer; - private EnumeratedValue enumeratedValue; - private StringValue stringValue; + private final DbTableViewer dbTableViewer; + private final EnumeratedValue enumeratedValue; + private final StringValue stringValue; private final DbItem dbItem; /** @@ -79,7 +79,7 @@ public class DbCellModifier implements ICellModifier { stringValue.setValue(((String) obj)); return stringValue; } else if (obj == null) { - stringValue.setValue(((String) "")); + stringValue.setValue(("")); return stringValue; } return null; @@ -114,10 +114,10 @@ public class DbCellModifier implements ICellModifier { dbModel.setColumnChanged(property); } } catch (Exception ex) { - OSEELog.logException(AdminPlugin.class, ex, true); + OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } else if (wasObj instanceof String) { - if (!((String) wasObj).equals((String) value)) { + if (!((String) wasObj).equals(value)) { dbModel.setColumn(columnIndex, value); dbModel.setNeedSave(true); dbModel.setColumnChanged(property); diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java index 4df33fccd6d..42c4755618d 100644 --- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java +++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java @@ -13,8 +13,9 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab; import org.eclipse.osee.framework.db.connection.ConnectionHandler; import org.eclipse.osee.framework.db.connection.ConnectionHandlerStatement; import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.ui.admin.AdminPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class OseeInfoDbItem extends DbItem { @@ -49,7 +50,7 @@ public class OseeInfoDbItem extends DbItem { chStmt.runPreparedQuery(query); toReturn = chStmt.next(); } catch (OseeDataStoreException ex) { - OSEELog.logException(AdminPlugin.class, ex, true); + OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex); } finally { chStmt.close(); } @@ -70,7 +71,7 @@ public class OseeInfoDbItem extends DbItem { ConnectionHandler.runPreparedUpdate(query, key, value); } } catch (OseeDataStoreException ex) { - OSEELog.logException(AdminPlugin.class, ex, true); + OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/menu/ServiceManagerMenuItem.java b/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/menu/ServiceManagerMenuItem.java index 46053c8a562..03689707c49 100644 --- a/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/menu/ServiceManagerMenuItem.java +++ b/org.eclipse.osee.framework.ui.service.control/src/org/eclipse/osee/framework/ui/service/control/menu/ServiceManagerMenuItem.java @@ -12,8 +12,10 @@ package org.eclipse.osee.framework.ui.service.control.menu; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.ui.service.control.ControlPlugin; import org.eclipse.osee.framework.ui.service.control.view.ServiceManagerView; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; @@ -36,7 +38,7 @@ public class ServiceManagerMenuItem implements IWorkbenchWindowActionDelegate { try { page.showView(ServiceManagerView.VIEW_ID); } catch (PartInitException ex) { - OSEELog.logException(getClass(), ex, true); + OseeLog.log(ControlPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java index 4c835b0a64d..d6370f82e06 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactContentProvider.java @@ -18,13 +18,13 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; import org.eclipse.osee.framework.skynet.core.access.PermissionEnum; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactChangeListener; import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * The basis for the comments in this class can be found at @@ -95,7 +95,7 @@ public class ArtifactContentProvider implements ITreeContentProvider, ArtifactCh try { return ((Artifact) element).getParent(); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } return null; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java index e0cc34a61a6..3b6838334cc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactDoubleClick.java @@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +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.access.AccessControlManager; @@ -27,7 +28,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.StaticIdManager; import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage; 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.OSEELog; import org.eclipse.search.ui.text.Match; /** @@ -45,7 +45,7 @@ public class ArtifactDoubleClick implements IDoubleClickListener { public static void openArtifact(ISelection selection) { IStructuredSelection structSel = (IStructuredSelection) selection; - Object object = (Object) structSel.getFirstElement(); + Object object = structSel.getFirstElement(); Artifact artifact = null; if (object instanceof Artifact) { artifact = (Artifact) structSel.getFirstElement(); @@ -73,8 +73,8 @@ public class ArtifactDoubleClick implements IDoubleClickListener { } } else { - OSEELog.logSevere(SkynetGuiPlugin.class, - "The user " + UserManager.getUser() + " does not have read access to " + artifact, true); + OseeLog.log(SkynetGuiPlugin.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); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java index 53f6064d9f1..e48b9d4e771 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java @@ -98,7 +98,6 @@ import org.eclipse.osee.framework.ui.skynet.util.ArtifactClipboard; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
import org.eclipse.osee.framework.ui.skynet.util.HierarchicalReportDialog;
import org.eclipse.osee.framework.ui.skynet.util.HtmlReportJob;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.ShowAttributeAction;
import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
import org.eclipse.osee.framework.ui.skynet.util.SkynetViews;
@@ -312,7 +311,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, checkBranchReadable();
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
OseeEventManager.addListener(this);
@@ -327,15 +326,15 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, try {
if (artifact.isDeleted()) {
- OSEELog.logSevere(SkynetGuiPlugin.class,
- "The artifact " + artifact.getDescriptiveName() + " has been deleted.", true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "The artifact " + artifact.getDescriptiveName() + " has been deleted.");
} else {
if (artifact.isHistorical()) {
artifact = ArtifactQuery.getArtifactFromId(artifact.getArtId(), artifact.getBranch(), false);
}
if (artifact.isOrphan()) {
- OSEELog.logSevere(SkynetGuiPlugin.class,
- "The artifact " + artifact.getDescriptiveName() + " does not have a parent (orphan).", true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "The artifact " + artifact.getDescriptiveName() + " does not have a parent (orphan).");
} else {
IWorkbenchPage page = AWorkbench.getActivePage();
ArtifactExplorer artifactExplorer = (ArtifactExplorer) page.showView(ArtifactExplorer.VIEW_ID);
@@ -343,7 +342,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, }
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -402,7 +401,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, treeViewer.setExpandedElements(expandedPlus);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
};
@@ -773,7 +772,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, myArtifact.setSoleAttributeValue("Name", newLabel);
myArtifact.persistAttributes();
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
treeViewer.refresh();
@@ -881,7 +880,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, AccessControlManager.getInstance().lockObject(object, UserManager.getUser());
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -954,7 +953,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, try {
artifactClipboard.pasteArtifactsFromClipboard((Artifact) object);
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -993,7 +992,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, job.setRecurseChildren(ld.isRecurseChildren());
Jobs.startJob(job);
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -1047,7 +1046,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, upAction.setEnabled(exploreRoot != null && exploreRoot.hasParent());
} catch (OseeCoreException ex) {
upAction.setEnabled(false);
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -1154,7 +1153,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, pasteMenuItem.setEnabled(permiss.isWritePermission());
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -1186,7 +1185,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, try {
explore(ArtifactPersistenceManager.getDefaultHierarchyRootArtifact(BranchManager.getDefaultBranch()));
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -1314,7 +1313,7 @@ public class ArtifactExplorer extends ViewPart implements IRebuildMenuListener, }
transaction.execute();
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java index ac05fc59281..d8ff28fa8f3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeCellModifier.java @@ -16,13 +16,14 @@ import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
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.skynet.core.attribute.Attribute;
import org.eclipse.osee.framework.skynet.core.attribute.BinaryAttribute;
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.util.OSEELog;
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;
@@ -72,7 +73,7 @@ public class AttributeCellModifier implements ICellModifier { return false;
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return property.equals("value");
@@ -133,7 +134,7 @@ public class AttributeCellModifier implements ICellModifier { attribute.setFromString((String) value);
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
tableViewer.update(element, null);
editor.onDirtied();
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java index 0b1fd9cfa85..d37fb208a2e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributeContentProvider.java @@ -13,8 +13,9 @@ package org.eclipse.osee.framework.ui.skynet; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.db.connection.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.util.OSEELog; /** * @author Ryan D. Brooks @@ -37,7 +38,7 @@ public class AttributeContentProvider implements IStructuredContentProvider { try { return ((Artifact) inputElement).getAttributes(false).toArray(); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } return dummyArray; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java index 45231900bad..83a2d2958b6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/AttributesComposite.java @@ -21,11 +21,11 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TableViewerEditor; import org.eclipse.osee.framework.db.connection.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.skynet.core.attribute.Attribute; import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.cellEditor.UniversalCellEditor; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.SWT; @@ -242,7 +242,7 @@ public class AttributesComposite extends Composite { item.addSelectionListener(listener); } } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } addItem.setMenu(attributesMenu); } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ImportMetaWizard.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ImportMetaWizard.java index 82f92ae9ea9..8f6529d3169 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ImportMetaWizard.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/Import/ImportMetaWizard.java @@ -13,9 +13,11 @@ package org.eclipse.osee.framework.ui.skynet.Import; import java.io.File; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Branch; import org.eclipse.osee.framework.ui.plugin.util.Jobs; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; @@ -47,7 +49,7 @@ public class ImportMetaWizard extends Wizard implements IImportWizard { File file = mainPage.getImportFile(); Jobs.startJob(new ImportMetaJob(file, branch)); } catch (Exception ex) { - OSEELog.logException(getClass(), "Define Import Error", ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Define Import Error", ex); } return true; } @@ -65,6 +67,7 @@ public class ImportMetaWizard extends Wizard implements IImportWizard { /** * (non-Javadoc) Method declared on Wizard. */ + @Override public void addPages() { mainPage = new ImportMetaPage(selection); mainPage.setTitle("Import Skynet types into Define"); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java index 1aa74bdb7e3..11ec2d4897f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java @@ -33,6 +33,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.ArtifactData; @@ -55,7 +56,6 @@ import org.eclipse.osee.framework.ui.skynet.artifact.massEditor.MassArtifactEdit 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; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.SWT; @@ -353,7 +353,7 @@ public class RelationsComposite extends Composite implements IRelationModifiedEv try { selectedArtifact = link.getArtifactOnOtherSide(artifact); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } ArtifactEditor.editArtifact(selectedArtifact); } @@ -369,7 +369,7 @@ public class RelationsComposite extends Composite implements IRelationModifiedEv try { selectedArtifacts.add(link.getArtifactB()); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -490,7 +490,7 @@ public class RelationsComposite extends Composite implements IRelationModifiedEv } } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } refresh(); } @@ -718,7 +718,7 @@ public class RelationsComposite extends Composite implements IRelationModifiedEv window.createArtifactInformationBox(null); } } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } isFeedbackAfter = false; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java index 906f98d55c1..602c032deea 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java @@ -11,10 +11,10 @@ package org.eclipse.osee.framework.ui.skynet; import java.util.logging.Level; - import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.SkynetActivator; import org.eclipse.osee.framework.skynet.core.User; @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.skynet.core.event.IBroadcastEventListneer; import org.eclipse.osee.framework.skynet.core.event.OseeEventManager; import org.eclipse.osee.framework.skynet.core.event.Sender; import org.eclipse.osee.framework.ui.plugin.OseeFormActivator; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchListener; @@ -164,7 +163,7 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven OseeEventManager.kickBroadcastEvent(this, BroadcastEventType.Pong, new String[] {}, sender.getOseeSession().toString()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } else if (broadcastEventType == BroadcastEventType.Pong) { // Got pong from another client; If message == this client's sessionId, then it's diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java index 9ac5b9e8732..7200cecec43 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/ArtifactPromptChange.java @@ -22,6 +22,8 @@ import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.osee.framework.db.connection.exception.AttributeDoesNotExist;
import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException;
import org.eclipse.osee.framework.db.connection.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.skynet.core.attribute.Attribute;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
@@ -35,7 +37,6 @@ 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.Selection;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.DateSelectionDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
import org.eclipse.swt.widgets.Display;
@@ -70,7 +71,7 @@ public class ArtifactPromptChange { } else
AWorkbench.popup("ERROR", "Unhandled attribute type. Can't edit through this view");
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return false;
}
@@ -190,7 +191,7 @@ public class ArtifactPromptChange { } catch (AttributeDoesNotExist ex) {
// do nothing - not an incorrect state
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
if (validationRegEx != null) ed.setValidationRegularExpression(validationRegEx);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java index 07de9f94f0a..bc293073f69 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/OpenArtifactAction.java @@ -13,13 +13,14 @@ package org.eclipse.osee.framework.ui.skynet.artifact; import org.eclipse.core.resources.IFile; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; +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.WorkspaceURL; import org.eclipse.osee.framework.ui.plugin.util.AWorkspace; import org.eclipse.osee.framework.ui.skynet.ArtifactDragDropSupport; 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.util.OSEELog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; @@ -50,7 +51,7 @@ public class OpenArtifactAction implements IObjectActionDelegate { try { artifact = ArtifactDragDropSupport.getArtifactFromWorkspaceFile(WorkspaceURL.getURL(iFile), shell); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } if (artifact != null) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java index d655bde0ac9..1cd672009d0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java @@ -26,6 +26,7 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+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.access.AccessControlManager;
@@ -67,7 +68,6 @@ import org.eclipse.osee.framework.ui.skynet.branch.BranchView; import org.eclipse.osee.framework.ui.skynet.history.RevisionHistoryView;
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.OSEELog;
import org.eclipse.osee.framework.ui.swt.IDirtiableEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.ProgressEvent;
@@ -130,13 +130,13 @@ public class ArtifactEditor extends MultiPageEditorPart implements IDirtiableEdi try {
for (Artifact artifact : artifacts) {
if (!AccessControlManager.checkObjectPermission(artifact, PermissionEnum.READ)) {
- OSEELog.logSevere(SkynetGuiPlugin.class,
- "The user " + UserManager.getUser() + " does not have read access to " + artifact, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "The user " + UserManager.getUser() + " does not have read access to " + artifact);
} else
AWorkbench.getActivePage().openEditor(new ArtifactEditorInput(artifact), EDITOR_ID);
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
@@ -147,13 +147,13 @@ public class ArtifactEditor extends MultiPageEditorPart implements IDirtiableEdi public void run() {
try {
if (!AccessControlManager.checkObjectPermission(artifact, PermissionEnum.READ)) {
- OSEELog.logSevere(SkynetGuiPlugin.class,
- "The user " + UserManager.getUser() + " does not have read access to " + artifact, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "The user " + UserManager.getUser() + " does not have read access to " + artifact);
} else if (artifact != null) {
AWorkbench.getActivePage().openEditor(new ArtifactEditorInput(artifact), EDITOR_ID);
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
@@ -471,7 +471,7 @@ public class ArtifactEditor extends MultiPageEditorPart implements IDirtiableEdi try {
ArtifactExplorer.revealArtifact(artifact);
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
});
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/NewAttributesComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/NewAttributesComposite.java index 7c0a819675a..2a9eaa4d8ec 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/NewAttributesComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/NewAttributesComposite.java @@ -15,11 +15,12 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +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.AttributeType; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; 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; @@ -79,7 +80,7 @@ public class NewAttributesComposite extends Composite { workPage = new WorkPage(widgets, new DefaultXWidgetOptionResolver()); workPage.createBody(toolkit, mainComp, artifact, xModifiedListener, true); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java index c240d595c59..6931fd69eeb 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; +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.access.AccessControlManager; @@ -35,7 +36,6 @@ 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.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; @@ -80,7 +80,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IDirti try { Artifacts.persistInTransaction(artifacts); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } onDirtied(); } @@ -111,7 +111,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IDirti if (accessControlFilteredResults) AWorkbench.popup("ERROR", "Some Artifacts not loaded due to access control limitations."); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }, options.contains(TableLoadOption.ForcePend)); @@ -179,7 +179,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IDirti try { page.openEditor(input, EDITOR_ID); } catch (PartInitException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -276,7 +276,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IDirti try { xViewer.set(((MassArtifactEditorInput) editorInput).getArtifacts()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java index 866e5f2ab25..58804e6cf50 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java @@ -20,6 +20,7 @@ import java.util.logging.Level; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.nebula.widgets.xviewer.XViewer; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.ArtifactData; @@ -38,7 +39,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.artifact.ArtifactPromptChange; 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.OSEELog; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSource; @@ -202,7 +202,7 @@ public class MassXViewer extends XViewer implements IFrameworkTransactionEventLi } refresh(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java index c89ddc30398..a0abced5f46 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamEditor.java @@ -12,12 +12,13 @@ package org.eclipse.osee.framework.ui.skynet.blam; import java.util.List; import org.eclipse.osee.framework.db.connection.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.plugin.util.Displays; 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.blam.operation.BlamOperation; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.PartInitException; @@ -40,7 +41,7 @@ public class BlamEditor extends AbstractArtifactEditor implements IBlamEventList setPartName("BLAM: " + getWorkflow().getDescriptiveName()); setTitleImage(SkynetGuiPlugin.getInstance().getImage("blam.gif")); } catch (PartInitException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -74,7 +75,7 @@ public class BlamEditor extends AbstractArtifactEditor implements IBlamEventList try { AWorkbench.getActivePage().openEditor(blamEditorInput, EDITOR_ID); } catch (PartInitException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamWorkflow.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamWorkflow.java index eeebfa31633..be0750d526a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamWorkflow.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/BlamWorkflow.java @@ -24,6 +24,8 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; +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.ArtifactFactory; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; @@ -33,7 +35,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.XWidgetParser; import org.eclipse.osee.framework.ui.skynet.blam.operation.BlamOperation; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData; import org.w3c.dom.Document; @@ -155,7 +156,7 @@ public class BlamWorkflow extends Artifact { return operations.get(0).getDescriptionUsage(); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return "Select parameters below and click the play button at the top right."; } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OverviewPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OverviewPage.java index 6d8f4fbef89..6dff2c45abf 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OverviewPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/OverviewPage.java @@ -12,6 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.blam; import java.util.List; 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.util.Jobs; import org.eclipse.osee.framework.ui.skynet.IHelpContextIds; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -19,7 +21,6 @@ import org.eclipse.osee.framework.ui.skynet.XFormToolkit; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; import org.eclipse.osee.framework.ui.skynet.blam.operation.BlamOperation; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayout; import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData; @@ -70,7 +71,7 @@ public class OverviewPage extends FormPage implements IActionable { this.dynamicXWidgetLayout = new DynamicXWidgetLayout(); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } @@ -101,7 +102,7 @@ public class OverviewPage extends FormPage implements IActionable { } parameterSection.setExpanded(true); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java index b84c54cce25..860f8c87e82 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java @@ -15,6 +15,8 @@ import java.util.List; import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.db.connection.exception.UserNotInDatabase; +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.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -26,7 +28,6 @@ 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.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.util.EmailGroupsAndUserGroups; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.EmailGroupsAndUserGroups.GroupType; import org.eclipse.osee.framework.ui.skynet.widgets.XList.XListItem; @@ -139,7 +140,7 @@ public class CreateNewUser extends AbstractBlam { widgetXml += "<XWidget xwidgetType=\"XList(" + groupStr + ")\" displayName=\"Groups\" defaultValue=\"Everyone\"/>"; } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } // widgetXml += "</xWidgets>"; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java index 464eaaf3718..4557823eed9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java @@ -13,6 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.io.File;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -20,7 +22,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.InputStreamImageDescriptor;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.widgets.Display;
/**
@@ -61,7 +62,7 @@ public class UpdateArtifactTypeImage extends AbstractBlam { new InputStreamImageDescriptor(imageFile.toURL().openStream());
ArtifactTypeManager.updateArtifactTypeImage(artifactSubtypeDescriptor, imageDescriptor);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
};
});
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java index 510cf46fd42..4cbd29bda84 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java @@ -12,6 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.blam.operation; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; +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.ArtifactChecks; import org.eclipse.osee.framework.skynet.core.artifact.IArtifactCheck; @@ -20,7 +22,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap; import org.eclipse.osee.framework.ui.skynet.results.XResultData; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * Calls extensions to determine if artifacts are valid to delete. @@ -53,12 +54,12 @@ public class ValidateArtifactsToDelete extends AbstractBlam { Result result = check.isDeleteable(artifacts); if (result.isFalse()) rd.logError(result.getText()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); rd.log("Exception occurred...see error log" + ex.getLocalizedMessage()); } } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } rd.log("\n"); rd.log("Validation Complete - Any errors will be displayed."); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchListComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchListComposite.java index 6b0cbb7b570..d76aee8e549 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchListComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchListComposite.java @@ -13,6 +13,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
@@ -27,7 +28,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.JobbedNode;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact;
import org.eclipse.osee.framework.ui.swt.ColumnSorter;
import org.eclipse.swt.SWT;
@@ -82,7 +82,7 @@ public class BranchListComposite implements IBranchEventListener { forcePopulateView();
OseeEventManager.addListener(this);
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java index b0a5ca8e594..cd968a8c551 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java @@ -78,7 +78,6 @@ import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.ats.IActionable;
import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.SkynetSelections;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.CheckBoxDialog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;
@@ -146,7 +145,7 @@ public class BranchView extends ViewPart implements IActionable { ((IEclipsePreferences) instanceNode.node(VIEW_ID)).addPreferenceChangeListener(getSingleton());
}
} catch (BackingStoreException ex) {
- OSEELog.logException(BranchView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
instanceNode.addNodeChangeListener(new IEclipsePreferences.INodeChangeListener() {
@@ -213,7 +212,7 @@ public class BranchView extends ViewPart implements IActionable { try {
branchListComposite.forcePopulateView();
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
};
@@ -310,7 +309,7 @@ public class BranchView extends ViewPart implements IActionable { try {
getViewPreference().flush();
} catch (BackingStoreException ex) {
- OSEELog.logException(BranchView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
super.dispose();
@@ -584,7 +583,7 @@ public class BranchView extends ViewPart implements IActionable { try {
ChangeView.open(selectedBranch);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return null;
@@ -741,7 +740,7 @@ public class BranchView extends ViewPart implements IActionable { try {
branchListComposite.forcePopulateView();
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
@@ -1022,7 +1021,7 @@ public class BranchView extends ViewPart implements IActionable { }
}
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
return null;
@@ -1157,7 +1156,7 @@ public class BranchView extends ViewPart implements IActionable { try {
selectedBranch.rename(newLabel);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
branchTable.refresh();
}
@@ -1264,7 +1263,7 @@ public class BranchView extends ViewPart implements IActionable { }
}
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return null;
}
@@ -1307,13 +1306,13 @@ public class BranchView extends ViewPart implements IActionable { else
ArtifactEditor.editArtifact(selectedBranch.getAssociatedArtifact());
} else {
- OSEELog.logSevere(
+ OseeLog.log(
SkynetGuiPlugin.class,
- "The user " + UserManager.getUser() + " does not have read access to " + selectedBranch.getAssociatedArtifact(),
- true);
+ OseeLevel.SEVERE_POPUP,
+ "The user " + UserManager.getUser() + " does not have read access to " + selectedBranch.getAssociatedArtifact());
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return null;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/CommitHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/CommitHandler.java index 865d34423ee..77599189e6d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/CommitHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/CommitHandler.java @@ -15,6 +15,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.type.MutableInteger;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.artifact.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -25,7 +27,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AbstractSelectionEnabledHandler import org.eclipse.osee.framework.ui.plugin.util.JobbedNode;
import org.eclipse.osee.framework.ui.plugin.util.Jobs;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.SkynetSelections;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeView;
import org.eclipse.swt.widgets.Display;
@@ -130,7 +131,7 @@ public class CommitHandler extends AbstractSelectionEnabledHandler { }
Jobs.startJob(new CommitJob(sourceBranch, destinationBranch));
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return null;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ParentBranchAction.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ParentBranchAction.java index ac9c29a7d72..5f83b4a9a98 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ParentBranchAction.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/ParentBranchAction.java @@ -17,10 +17,11 @@ import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.window.Window; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Branch; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.NonBlankValidator; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; @@ -57,7 +58,7 @@ public class ParentBranchAction extends Action { try { createNewParentBranch(dialog.getValue(), dialog.getValue()); } catch (Exception ex) { - OSEELog.logException(getClass(), ex, true); + OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java index 8a087445198..e0df4de7b9b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/CompressWordAttributesHandler.java @@ -21,6 +21,8 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -29,7 +31,6 @@ import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays;
import org.eclipse.osee.framework.ui.plugin.util.Jobs;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.ui.PlatformUI;
/**
@@ -105,7 +106,7 @@ public class CompressWordAttributesHandler extends AbstractHandler { }
}
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
enabled = false;
}
return enabled;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java index b48ecfe8497..744cb0976a6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/DeleteArtifactHandler.java @@ -18,6 +18,8 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -26,7 +28,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; 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.util.OSEELog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
@@ -56,7 +57,7 @@ public class DeleteArtifactHandler extends CommandHandler { transaction.execute();
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return null;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java index b2ed0deb8f0..909066ed443 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/PasteHandler.java @@ -17,10 +17,11 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+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.Branch;
import org.eclipse.osee.framework.ui.skynet.util.ArtifactClipboard;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.search.ui.text.Match;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -61,7 +62,7 @@ public class PasteHandler extends AbstractHandler { try {
clipboard.pasteArtifactsFromClipboard((Artifact) selectionObject);
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java index a2c8e09634b..49f7839868d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertArtifactHandler.java @@ -24,6 +24,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.db.connection.DbTransaction;
import org.eclipse.osee.framework.db.connection.OseeConnection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
@@ -31,7 +33,6 @@ import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Jobs;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
@@ -127,7 +128,7 @@ public class RevertArtifactHandler extends AbstractHandler { }
}
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
return false;
}
return isEnabled;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java index 94399548a15..f976b69eeb6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/RevertAttributeHandler.java @@ -24,6 +24,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.db.connection.DbTransaction;
import org.eclipse.osee.framework.db.connection.OseeConnection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
@@ -31,7 +33,6 @@ import org.eclipse.osee.framework.skynet.core.attribute.Attribute; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.plugin.util.Jobs;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
@@ -128,7 +129,7 @@ public class RevertAttributeHandler extends AbstractHandler { }
}
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
return false;
}
return isEnabled;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java index 8f3b77df555..5d088faecd3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowArtifactInResourceHandler.java @@ -16,6 +16,8 @@ import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -24,7 +26,6 @@ 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.history.RevisionHistoryView;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PlatformUI;
@@ -47,7 +48,7 @@ public class ShowArtifactInResourceHandler extends CommandHandler { IWorkbenchPage.VIEW_ACTIVATE);
revisionHistoryView.explore(ArtifactQuery.getArtifactFromId(artifact.getGuid(), artifact.getBranch(), true));
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return null;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java index 0f415ea143b..13d7b7ff3ca 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ShowPreviewHandler.java @@ -16,11 +16,12 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+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.revision.ArtifactChange;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
/**
* @author Paul K. Waldfogel
@@ -50,7 +51,7 @@ public class ShowPreviewHandler extends AbstractHandler { selectedArtifact = mySelectedArtifactChange.getArtifact();
ArtifactEditor.editArtifact(selectedArtifact);
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java index d9f0639f5da..37ab68d0eb8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/ViewWordChangeReportHandler.java @@ -25,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
@@ -36,7 +37,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.WordTemplateRenderer;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.ui.PlatformUI;
/**
@@ -44,7 +44,7 @@ import org.eclipse.ui.PlatformUI; * @author Jeff C. Phillips
*/
public class ViewWordChangeReportHandler extends AbstractHandler {
- private Map<Integer, ArtifactChange> artifactChangeMap = new HashMap<Integer, ArtifactChange>();
+ private final Map<Integer, ArtifactChange> artifactChangeMap = new HashMap<Integer, ArtifactChange>();
/*
* (non-Javadoc)
@@ -102,7 +102,7 @@ public class ViewWordChangeReportHandler extends AbstractHandler { renderer.compareArtifacts(baseArtifacts, newerArtifacts, new NullProgressMonitor(),
instanceOfArtifact.getBranch(), PresentationType.DIFF);
} catch (OseeCoreException e) {
- OSEELog.logException(getClass(), e, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, e);
}
return null;
}
@@ -133,7 +133,7 @@ public class ViewWordChangeReportHandler extends AbstractHandler { isEnabled = AccessControlManager.getInstance().checkObjectListPermission(artifacts, PermissionEnum.READ);
}
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
return isEnabled;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesBetweenCurrentAndParentHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesBetweenCurrentAndParentHandler.java index 939148249cf..1f3049e0bcf 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesBetweenCurrentAndParentHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesBetweenCurrentAndParentHandler.java @@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.core.enums.ModificationType;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
@@ -30,7 +31,6 @@ import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.ui.PlatformUI;
/**
@@ -88,7 +88,7 @@ public class WordChangesBetweenCurrentAndParentHandler extends AbstractHandler { modifiedWordArtifactSelected && artifactChange.getChangeType() == ChangeType.CONFLICTING;
isEnabled = readPermission && conflictedWordArtifactSelected;
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
return isEnabled;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesMadeToHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesMadeToHandler.java index 1b7e4466886..4ff4d8cbcd6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesMadeToHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesMadeToHandler.java @@ -19,6 +19,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
@@ -29,7 +30,6 @@ import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.ui.PlatformUI;
/**
@@ -94,7 +94,7 @@ public class WordChangesMadeToHandler extends AbstractHandler { boolean wordArtifactSelected = changedArtifact.isOfType(WordArtifact.ARTIFACT_NAME);
isEnabled = readPermission && wordArtifactSelected;
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
return isEnabled;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java index 20caf6c71fd..b3316a4c6c7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/commandHandlers/WordChangesToParentHandler.java @@ -19,6 +19,8 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.access.AccessControlManager;
import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -29,7 +31,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.ui.PlatformUI;
/**
@@ -66,7 +67,7 @@ public class WordChangesToParentHandler extends AbstractHandler { RendererManager.diffInJob(firstArtifact, secondArtifact);
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
}
return null;
@@ -108,7 +109,7 @@ public class WordChangesToParentHandler extends AbstractHandler { isEnabled = validDiffParent && modifiedWordArtifactSelected && readPermission;
}
} catch (Exception ex) {
- OSEELog.logException(getClass(), ex, true);
+ OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex);
}
return isEnabled;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java index 6e638d80e4c..c22dbcbba47 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/export/ArtifactExportPage.java @@ -17,10 +17,11 @@ import java.util.Collection; import java.util.Iterator;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.viewers.IStructuredSelection;
+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.plugin.util.OseeData;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.search.ui.text.Match;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -58,7 +59,7 @@ public class ArtifactExportPage extends WizardDataTransferPage { if (selectedObject instanceof Artifact) {
selectedArtifacts.add((Artifact) selectedObject);
} else {
- OSEELog.logSevere(SkynetGuiPlugin.class, "Expected selection to be of type Artifact", true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Expected selection to be of type Artifact");
}
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java index c63dece5961..d1ab4e35866 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java @@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.BranchManager; @@ -44,7 +45,6 @@ import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; 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.DbConnectionExceptionComposite; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -213,7 +213,7 @@ public class GroupExplorer extends ViewPart implements IBranchEventListener, IFr UniversalGroup.addGroup(ed.getEntry(), BranchManager.getDefaultBranch()); treeViewer.refresh(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -235,7 +235,7 @@ public class GroupExplorer extends ViewPart implements IBranchEventListener, IFr } transaction.execute(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -258,7 +258,7 @@ public class GroupExplorer extends ViewPart implements IBranchEventListener, IFr } transaction.execute(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java index a656cfc9a10..143f4670d40 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerDragAndDrop.java @@ -13,6 +13,8 @@ import java.util.List; import java.util.Set;
import org.eclipse.jface.viewers.IStructuredSelection;
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.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTransfer;
@@ -23,7 +25,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; 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.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
@@ -260,7 +261,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { isFeedbackAfter = false;
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -290,7 +291,7 @@ public class GroupExplorerDragAndDrop extends SkynetDragAndDrop { transaction.execute();
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java index b86289361fc..49962c5ea01 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java @@ -16,6 +16,7 @@ import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist;
import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.BranchManager;
@@ -36,7 +37,6 @@ import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; import org.eclipse.osee.framework.ui.skynet.listener.IRebuildMenuListener;
import org.eclipse.osee.framework.ui.skynet.menu.ArtifactDiffMenu;
import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -80,7 +80,7 @@ public class RevisionHistoryView extends ViewPart implements IRebuildMenuListene IWorkbenchPage.VIEW_ACTIVATE);
revisionHistoryView.explore(artifact);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -221,7 +221,7 @@ public class RevisionHistoryView extends ViewPart implements IRebuildMenuListene } catch (ArtifactDoesNotExist ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.INFO, ex);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/Transaction2ClickListener.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/Transaction2ClickListener.java index 633ff15b673..507cc9fa413 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/Transaction2ClickListener.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/Transaction2ClickListener.java @@ -13,6 +13,8 @@ package org.eclipse.osee.framework.ui.skynet.history; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; +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.skynet.core.artifact.StaticIdManager; @@ -21,7 +23,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage; 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.OSEELog; /** * @author Ryan D. Brooks @@ -37,7 +38,7 @@ public class Transaction2ClickListener implements IDoubleClickListener { if (selectedItem instanceof TransactionData) { openArtifact((TransactionData) selectedItem); } else { - OSEELog.logSevere(SkynetGuiPlugin.class, "Selected item not of expected type", true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Selected item not of expected type"); } } @@ -51,7 +52,7 @@ public class Transaction2ClickListener implements IDoubleClickListener { RendererManager.openInJob(artifact, PresentationType.GENERALIZED_EDIT); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }
\ No newline at end of file diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactsUi.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactsUi.java index 2ed65d3805c..a3dfc8ac67a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactsUi.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/ArtifactsUi.java @@ -15,11 +15,13 @@ import java.util.List; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; +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.ArtifactPersistenceManager; import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange; import org.eclipse.osee.framework.skynet.core.revision.TransactionData; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.swt.ITreeNode; import org.eclipse.osee.framework.ui.swt.TreeViewerUtility; import org.eclipse.search.ui.text.Match; @@ -55,7 +57,7 @@ public class ArtifactsUi { TreeViewerUtility.getPreorderSelection((TreeViewer) viewer, selectedItems); } } catch (Exception ex) { - OSEELog.logException(ArtifactsUi.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } else { for (Object object : selection.toArray()) { diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java index 8a51f23b954..6bf8e223da3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/menu/GlobalMenu.java @@ -25,6 +25,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.db.connection.DbTransaction; import org.eclipse.osee.framework.db.connection.OseeConnection; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.SkynetActivator; import org.eclipse.osee.framework.skynet.core.access.AccessControlManager; @@ -34,7 +35,6 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Jobs; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MenuEvent; import org.eclipse.swt.events.MenuListener; @@ -101,7 +101,7 @@ public class GlobalMenu { if (purgeMenuItem != null) purgeMenuItem.setEnabled(permiss.isHasArtifacts() && AccessControlManager.isOseeAdmin()); if (tagMenuItem != null) tagMenuItem.setEnabled(permiss.isHasArtifacts() && permiss.isFullAccess()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -153,7 +153,7 @@ public class GlobalMenu { } } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java index b51c9d781b2..4fae057e9c9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditAttributeWizardPage.java @@ -13,9 +13,10 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard; import java.util.Arrays;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.WizardPage;
+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.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -49,7 +50,7 @@ public class EditAttributeWizardPage extends WizardPage { private static final String CLEAR_TOOLTIP = "Clear the Editor Value";
private static final int NUM_COLUMNS = 1;
private IEmbeddedAttributeEditor editor;
-
+
private final Listener listener = new Listener() {
public void handleEvent(Event event) {
// ...
@@ -73,7 +74,7 @@ public class EditAttributeWizardPage extends WizardPage { }
} catch (Exception ex) {
- OSEELog.logException(EditAttributeWizardPage.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
getWizard().getContainer().updateButtons();
}
@@ -96,7 +97,7 @@ public class EditAttributeWizardPage extends WizardPage { Arrays.asList(conflict), true);
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -141,7 +142,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.logException(EditAttributeWizardPage.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
Composite buttonComp = new Composite(composite, SWT.NONE);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java index b0af307a579..b0531946e6e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EditWFCAttributeWizardPage.java @@ -13,11 +13,12 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard; import java.util.Date;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osee.framework.db.connection.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.render.PresentationType;
import org.eclipse.osee.framework.ui.skynet.render.RendererManager;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.XMergeLabelProvider;
import org.eclipse.swt.SWT;
@@ -128,7 +129,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { MergeUtility.launchMerge(conflict, getShell());
}
} catch (Exception ex) {
- OSEELog.logException(EditWFCAttributeWizardPage.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
getWizard().getContainer().updateButtons();
}
@@ -146,7 +147,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { changeType = conflict.getDynamicAttributeDescriptor().getName();
}
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -176,7 +177,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.logException(EditWFCAttributeWizardPage.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
new Label(composite, SWT.NONE);
@@ -210,7 +211,7 @@ public class EditWFCAttributeWizardPage extends WizardPage { try {
setResolution(XMergeLabelProvider.getMergeImage(conflict));
} catch (Exception ex) {
- OSEELog.logException(EditWFCAttributeWizardPage.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
setControl(composite);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java index b79ff464fff..9efc91381f5 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedBooleanAttributeEditor.java @@ -12,10 +12,12 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard;
import java.util.Collection;
+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.conflict.AttributeConflict;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -71,11 +73,12 @@ public class EmbeddedBooleanAttributeEditor implements IEmbeddedAttributeEditor Object object = ((Artifact) obj).getSoleAttributeValue(attributeName);
if (object instanceof Boolean)
editor.setEntry(((Boolean) object).booleanValue());
- else
- OSEELog.logException(EmbeddedBooleanAttributeEditor.class, new Exception(
- "Boolean editor did not receive a boolean value"), true);
+ else {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, new Exception(
+ "Boolean editor did not receive a boolean value"));
+ }
} catch (Exception ex) {
- OSEELog.logException(EmbeddedBooleanAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
if (obj instanceof AttributeConflict) {
@@ -85,7 +88,7 @@ public class EmbeddedBooleanAttributeEditor implements IEmbeddedAttributeEditor }
}
} catch (Exception ex) {
- OSEELog.logException(EmbeddedBooleanAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return true;
}
@@ -111,7 +114,7 @@ public class EmbeddedBooleanAttributeEditor implements IEmbeddedAttributeEditor }
return true;
} catch (Exception ex) {
- OSEELog.logException(EmbeddedBooleanAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
AWorkbench.popup("ERROR", "Could not store the attribute");
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java index 05d3b478cd1..d878b2406a7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedDateAttributeEditor.java @@ -13,10 +13,12 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard; import java.util.Collection;
import java.util.Date;
+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.conflict.AttributeConflict;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -70,7 +72,7 @@ public class EmbeddedDateAttributeEditor implements IEmbeddedAttributeEditor { Object object = ((Artifact) obj).getSoleAttributeValue(attributeName);
if (object instanceof Date) date = (Date) object;
} catch (Exception ex) {
- OSEELog.logException(EmbeddedDateAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
if (obj instanceof AttributeConflict) try {
@@ -79,7 +81,7 @@ public class EmbeddedDateAttributeEditor implements IEmbeddedAttributeEditor { date = (Date) object;
}
} catch (Exception ex) {
- OSEELog.logException(EmbeddedDateAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
editor = new EmbeddedDateEditor("Edit " + displayName, date);
@@ -116,7 +118,7 @@ public class EmbeddedDateAttributeEditor implements IEmbeddedAttributeEditor { }
return true;
} catch (Exception ex) {
- OSEELog.logException(EmbeddedDateAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
AWorkbench.popup("ERROR", "Could not store the attribute");
return false;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java index 1c4d50530f4..5164a74c9d9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedEnumAttributeEditor.java @@ -14,11 +14,13 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard; import java.util.Collection;
import java.util.TreeSet;
import org.eclipse.osee.framework.db.connection.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.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.util.OSEELog;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -84,13 +86,13 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { editor.addSelectionChoice(string);
}
} catch (OseeCoreException ex) {
- OSEELog.logException(EmbeddedEnumAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
if (obj instanceof Artifact) {
try {
editor.setSelected(((Artifact) obj).getSoleAttributeValue(attributeName).toString());
} catch (Exception ex) {
- OSEELog.logException(EmbeddedEnumAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else if (obj instanceof AttributeConflict) {
try {
@@ -98,7 +100,7 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { editor.setSelected(((AttributeConflict) obj).getMergeObject().toString());
}
} catch (Exception ex) {
- OSEELog.logException(EmbeddedEnumAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return true;
@@ -130,7 +132,7 @@ public class EmbeddedEnumAttributeEditor implements IEmbeddedAttributeEditor { }
return true;
} catch (Exception ex) {
- OSEELog.logException(EmbeddedEnumAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return true;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java index 4f50ca85432..6286cfe68a9 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbeddedStringAttributeEditor.java @@ -12,10 +12,12 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard;
import java.util.Collection;
+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.conflict.AttributeConflict;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.MergeUtility;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -77,7 +79,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { try {
editor.setEntry(((Artifact) obj).getSoleAttributeValue(attributeName).toString());
} catch (Exception ex) {
- OSEELog.logException(EmbeddedStringAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else if (obj instanceof AttributeConflict) {
try {
@@ -85,7 +87,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { editor.setEntry(((AttributeConflict) obj).getMergeObject().toString());
}
} catch (Exception ex) {
- OSEELog.logException(EmbeddedStringAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
if (regExp != null) editor.setValidationRegularExpression(regExp);
@@ -113,7 +115,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { AWorkbench.popup("Attention", MergeUtility.COMMITED_PROMPT);
}
} catch (Exception ex) {
- OSEELog.logException(EmbeddedStringAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else {
if (!((AttributeConflict) object).clearValue()) {
@@ -124,7 +126,7 @@ public class EmbeddedStringAttributeEditor implements IEmbeddedAttributeEditor { }
return true;
} catch (Exception ex) {
- OSEELog.logException(EmbeddedStringAttributeEditor.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return false;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java index 8e9e71fa109..cb0c49d0908 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/mergeWizard/EmbededAttributeEditorFactory.java @@ -12,6 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.mergeWizard;
import java.util.Collection;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.attribute.Attribute;
import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;
import org.eclipse.osee.framework.skynet.core.attribute.BooleanAttribute;
@@ -22,7 +24,6 @@ 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.util.OSEELog;
/**
* @author Theron Virgin
@@ -56,7 +57,7 @@ public class EmbededAttributeEditorFactory { } else
AWorkbench.popup("ERROR", "Unhandled attribute type. No editor defined for this type");
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return null;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java index 962de98d596..cd88772442a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/notify/OseeNotifyUsersJob.java @@ -26,12 +26,12 @@ import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.AHTML; 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.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.results.XResultData; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.OseeEmail; import org.eclipse.osee.framework.ui.skynet.util.OseeEmail.BodyType; @@ -76,7 +76,7 @@ public class OseeNotifyUsersJob extends Job { monitor.done(); return Status.OK_STATUS; } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); return new Status(Status.ERROR, SkynetGuiPlugin.PLUGIN_ID, -1, ex.getMessage(), ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java index 88cc2016760..c70b13743ee 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationExplorerWindow.java @@ -15,13 +15,14 @@ import java.util.ArrayList; import org.eclipse.core.resources.IFile; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.WorkspaceURL; import org.eclipse.osee.framework.skynet.core.relation.RelationTypeSide; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.ControlEvent; @@ -303,7 +304,7 @@ public class RelationExplorerWindow { artifact.setSoleAttributeValue("Content URL", urls.get(names.indexOf(model.getName()))); artifact.persistAttributes(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } else @@ -313,7 +314,7 @@ public class RelationExplorerWindow { try { relationGroup.getArtifact().addRelation(relationGroup, artifact); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -322,7 +323,7 @@ public class RelationExplorerWindow { try { relationGroup.getArtifact().persistRelations(); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } shell.dispose(); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java index f3c29cd2ee7..ad08310ad6e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/relation/explorer/RelationTableViewer.java @@ -21,6 +21,8 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; @@ -28,7 +30,6 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.attribute.TypeValidityManager; import org.eclipse.osee.framework.skynet.core.utility.Requirements; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -71,7 +72,7 @@ public class RelationTableViewer { TypeValidityManager.getValidArtifactTypes(BranchManager.getDefaultBranch())); defaultArtifactType = ArtifactTypeManager.getType(Requirements.TEST_SCRIPT); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } this.validTable = validTable; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java index bc2d05027ce..c455fad37a8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/render/WordTemplateRenderer.java @@ -31,6 +31,8 @@ import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.Pair;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp;
+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.skynet.core.artifact.Branch;
@@ -52,7 +54,6 @@ import org.eclipse.osee.framework.ui.skynet.render.word.Producer; import org.eclipse.osee.framework.ui.skynet.render.word.WordMLProducer;
import org.eclipse.osee.framework.ui.skynet.render.word.WordTemplateProcessor;
import org.eclipse.osee.framework.ui.skynet.templates.TemplateManager;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.w3c.dom.Element;
import com.sun.org.apache.xml.internal.serialize.OutputFormat;
import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
@@ -220,7 +221,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende }
generator.addComparison(baseFile, newerFile, localFileName, false);
} catch (OseeCoreException ex) {
- OSEELog.logException(WordTemplateRenderer.class, ex, false);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -378,6 +379,7 @@ public class WordTemplateRenderer extends WordRenderer implements ITemplateRende *
* @see org.eclipse.osee.framework.ui.skynet.render.IRenderer#isValidFor(org.eclipse.osee.framework.skynet.core.artifact.Artifact)
*/
+ @Override
public int getApplicabilityRating(PresentationType presentationType, Artifact artifact) {
if (!artifact.isOfType(WordArtifact.WHOLE_WORD) && !artifact.isOfType("Native")) {
if (presentationType == PresentationType.DIFF || presentationType == PresentationType.PREVIEW) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java index 7991101416a..242b4c63124 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/ResultsEditor.java @@ -17,6 +17,7 @@ import java.util.logging.Level; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Displays; @@ -27,7 +28,6 @@ import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; 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.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.swt.ALayout; import org.eclipse.osee.framework.ui.swt.IDirtiableEditor; import org.eclipse.swt.widgets.Composite; @@ -211,7 +211,7 @@ public class ResultsEditor extends AbstractArtifactEditor implements IDirtiableE try { page.openEditor(new ResultsEditorInput(provider), EDITOR_ID); } catch (PartInitException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }, forcePend); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultBrowserListener.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultBrowserListener.java index 16bd5c200f6..cf499510f65 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultBrowserListener.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultBrowserListener.java @@ -12,12 +12,13 @@ package org.eclipse.osee.framework.ui.skynet.results.html; import java.util.regex.Pattern; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Branch; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; import org.eclipse.osee.framework.ui.skynet.branch.BranchView; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.browser.LocationEvent; import org.eclipse.swt.browser.LocationListener; @@ -60,7 +61,7 @@ public class ResultBrowserListener implements LocationListener { OseeAts.getAtsLib().openArtifact(hrid, branchId, OseeAts.OpenView.ActionEditor); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } else if (resultBrowserHyperCmd == ResultBrowserHyperCmd.openArtifactEditor) { event.doit = false; @@ -75,7 +76,7 @@ public class ResultBrowserListener implements LocationListener { BranchView.revealBranch(branch); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Can't process hyperlink.", ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Can't process hyperlink.", ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java index e4da246caed..0676890b1ee 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/results/html/ResultsEditorHtmlTab.java @@ -9,10 +9,11 @@ import java.util.HashSet; import java.util.Set;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
import org.eclipse.osee.framework.jdk.core.util.AFile;
+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.results.ResultsEditor;
import org.eclipse.osee.framework.ui.skynet.results.html.XResultPage.Manipulations;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.dialog.Dialogs;
import org.eclipse.osee.framework.ui.swt.ALayout;
import org.eclipse.swt.SWT;
@@ -150,7 +151,7 @@ public class ResultsEditorHtmlTab implements IResultsEditorHtmlTab { resultsEditor.addResultsTab(new ResultsEditorHtmlTab(new XResultPage(filename, html,
Manipulations.RAW_HTML)));
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchQuery.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchQuery.java index d75e928687f..13e0ebda1ca 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchQuery.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchQuery.java @@ -15,8 +15,9 @@ import java.util.Collection; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; +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.util.OSEELog; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.ISearchResult; import org.eclipse.search.ui.NewSearchUI; @@ -44,7 +45,7 @@ public abstract class AbstractArtifactSearchQuery implements ISearchQuery { numberOfMatches++; } } catch (Exception ex) { - OSEELog.logException(getClass(), ex, true); + OseeLog.log(getClass(), OseeLevel.SEVERE_POPUP, ex); } doneRunning = true; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java index 71baeeff5b5..7ca9b75be34 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/AbstractArtifactSearchResult.java @@ -17,9 +17,10 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import org.eclipse.osee.framework.db.connection.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.util.OSEELog; import org.eclipse.search.ui.ISearchResult; import org.eclipse.search.ui.ISearchResultListener; import org.eclipse.search.ui.SearchResultEvent; @@ -258,7 +259,7 @@ public abstract class AbstractArtifactSearchResult implements ISearchResult { // remove all of its children removeArtifacts(artifact.getChildren()); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java index 3148fbf8d77..76c62191eb8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/ArtifactSearchPage.java @@ -28,6 +28,8 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.osee.framework.db.connection.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.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.Branch; @@ -42,7 +44,6 @@ 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; import org.eclipse.osee.framework.ui.skynet.util.DbConnectionExceptionComposite; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.HyperLinkLabel; import org.eclipse.search.ui.IReplacePage; import org.eclipse.search.ui.ISearchPage; @@ -171,7 +172,8 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl artifactTypeList.setData(descriptor.getName(), descriptor); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Error encountered while getting list of artifact types", ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + "Error encountered while getting list of artifact types", ex); } addToSearchTypeList(new ArtifactTypeFilter(artifactTypeControls, artifactTypeList)); } @@ -206,7 +208,7 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl relationTypeList.setData(linkDescriptor.getTypeName(), linkDescriptor); } } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } relationTypeList.getCombo().addSelectionListener(new SelectionAdapter() { @@ -283,8 +285,8 @@ public class ArtifactSearchPage extends DialogPage implements ISearchPage, IRepl attributeTypeList.setData(type.getName(), type); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Error encountered while getting list of attribute types", ex, - true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + "Error encountered while getting list of attribute types", ex); } attributeTypeList.getCombo().setVisibleItemCount(Math.min(attributeTypeList.getCombo().getItemCount(), 15)); attributeTypeList.getCombo().select(lastAttributeTypeListSelected); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java index e4c4c39b59a..4a8a8b7228f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/OrphanSearchFilter.java @@ -12,6 +12,8 @@ package org.eclipse.osee.framework.ui.skynet.search; import org.eclipse.jface.viewers.ListViewer; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive; @@ -19,7 +21,6 @@ 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.search.filter.FilterTableViewer; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Control; /** @@ -52,7 +53,7 @@ public class OrphanSearchFilter extends SearchFilter { filterViewer.addItem(primitive, getFilterName(), typeName, ""); } } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/EmailableJob.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/EmailableJob.java index a893c560870..67c09174f7d 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/EmailableJob.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/EmailableJob.java @@ -17,6 +17,8 @@ import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; +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.skynet.core.UserManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; @@ -50,11 +52,11 @@ public class EmailableJob extends Job { emails.add(user.getEmail()); emails.addAll(emailAddresses); OseeEmail emailMessage = - new OseeEmail(emails, UserManager.getUser().getEmail(), - UserManager.getUser().getEmail(), subject, htmlBody, BodyType.Html); + new OseeEmail(emails, UserManager.getUser().getEmail(), UserManager.getUser().getEmail(), subject, + htmlBody, BodyType.Html); emailMessage.send(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Your Email Message could not be sent.", ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Your Email Message could not be sent.", ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OSEELog.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OSEELog.java deleted file mode 100644 index d4377c67892..00000000000 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OSEELog.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.framework.ui.skynet.util; - -import java.util.logging.Level; -import org.eclipse.osee.framework.logging.OseeLog; -import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; - -/** - * @author Donald G. Dunne - */ -public class OSEELog { - - public static void logException(Class<?> clazz, String message, Exception ex, boolean popup) { - AWorkbench.popup("ERROR", message); - OseeLog.log(clazz, Level.SEVERE, message, ex); - } - - public static void logSevere(Class<?> clazz, String message, boolean popup) { - AWorkbench.popup("ERROR", message); - OseeLog.log(clazz, Level.SEVERE, message); - } - - public static void logException(Class<?> clazz, Exception ex, boolean popup) { - String message = ex.getLocalizedMessage() == null ? ex.getClass().getName() : ex.getLocalizedMessage(); - logException(clazz, message, ex, popup); - } -}
\ No newline at end of file diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java index 6c63b078b9e..7a1d30a3f6a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/OseeDictionary.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; 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.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.swt.styledText.IDictionary; @@ -93,7 +94,7 @@ public class OseeDictionary implements IDictionary { return; } if (point == null) { - OSEELog.logSevere(SkynetGuiPlugin.class, "Can't access OseeDictionary extension point", true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access OseeDictionary extension point"); return; } IExtension[] extensions = point.getExtensions(); @@ -112,7 +113,8 @@ public class OseeDictionary implements IDictionary { Object obj = taskClass.newInstance(); dictionaries.add((IOseeDictionary) obj); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, "Error loading OseeDictionary extension", ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, + "Error loading OseeDictionary extension", ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java index 8316e7eedb9..7f4a782616e 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/SkynetDragAndDrop.java @@ -12,7 +12,6 @@ package org.eclipse.osee.framework.ui.skynet.util; import java.util.ArrayList; import java.util.Collection; - import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData; diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java index a5420e1f2f0..605bd65cb4b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/email/EmailWizardPage.java @@ -22,12 +22,12 @@ import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; import org.eclipse.osee.framework.ui.plugin.util.ArrayTreeContentProvider; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEEFilteredTree; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -216,7 +216,7 @@ public class EmailWizardPage extends WizardPage { try { bccList.setInput(new Object[] {UserManager.getUser().getEmail()}); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } // Additional Text diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java index 11e9518014d..2626cd04537 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/SkynetSpellModifyDictionary.java @@ -15,13 +15,14 @@ import java.util.Set; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.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.skynet.core.artifact.GlobalPreferences; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.util.IOseeDictionary; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Display; /** @@ -42,7 +43,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, try { return updateArtifact("Global", word, GlobalPreferences.get()); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } @@ -56,7 +57,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, try { return updateArtifact("Local", word, UserManager.getUser()); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); return false; } } @@ -74,7 +75,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, loadDictionary(true); return true; } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } return false; @@ -115,7 +116,7 @@ public class SkynetSpellModifyDictionary implements XTextSpellModifyDictionary, } } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java index 249d4cdd23d..2e9d1493045 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XArtifactTypeListViewer.java @@ -11,10 +11,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.ArrayList; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Jeff C. Phillips @@ -36,7 +37,7 @@ public class XArtifactTypeListViewer extends XTypeListViewer { ArtifactType artifactType = ArtifactTypeManager.getType(defaultValue); setDefaultSelected(artifactType); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java index 247e20ba591..caeaaa739ed 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XAttributeTypeListViewer.java @@ -11,10 +11,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.ArrayList; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.attribute.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Jeff C. Phillips @@ -39,7 +40,7 @@ public class XAttributeTypeListViewer extends XTypeListViewer { AttributeType attributeType = AttributeTypeManager.getType(defaultValue); setDefaultSelected(attributeType); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java index c796e5a2ae5..9665da8c8ba 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCheckBoxDam.java @@ -11,10 +11,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -39,7 +40,7 @@ public class XCheckBoxDam extends XCheckBox implements IArtifactWidget { try { artifact.setSoleAttributeValue(attributeTypeName, checkButton.getSelection()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java index b4ee0b44170..64886c876d8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XCombo.java @@ -15,7 +15,6 @@ import java.util.Iterator; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.eclipse.osee.framework.jdk.core.util.AHTML;
import org.eclipse.osee.framework.ui.plugin.util.Result;
import org.eclipse.swt.SWT;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java index fc3b1766680..7e1b8431ac0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboBooleanDam.java @@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.osee.framework.db.connection.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class XComboBooleanDam extends XCombo implements IArtifactWidget { @@ -46,7 +47,7 @@ public class XComboBooleanDam extends XCombo implements IArtifactWidget { artifact.setSoleAttributeValue(attributeTypeName, (enteredValue != null && enteredValue.equals("yes"))); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java index d363b7677df..0ca7d941100 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XComboDam.java @@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.osee.framework.db.connection.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class XComboDam extends XCombo implements IArtifactWidget { @@ -47,7 +48,7 @@ public class XComboDam extends XCombo implements IArtifactWidget { artifact.setSoleAttributeValue(attributeTypeName, enteredValue); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java index 98576b558d9..e032d85f193 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDate.java @@ -17,7 +17,6 @@ import java.util.Calendar; import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.eclipse.nebula.widgets.calendarcombo.CalendarCombo;
import org.eclipse.nebula.widgets.calendarcombo.CalendarListenerAdapter;
import org.eclipse.osee.framework.jdk.core.util.AHTML;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java index 5a47479bb61..3293520fe64 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XDateDam.java @@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.Date; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class XDateDam extends XDate implements IArtifactWidget { @@ -45,7 +46,7 @@ public class XDateDam extends XDate implements IArtifactWidget { artifact.setSoleAttributeValue(attributeTypeName, enteredValue); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java index aaf12b0e40b..58afa841882 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XFloatDam.java @@ -11,10 +11,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; /** * @author Donald G. Dunne @@ -58,7 +59,7 @@ public class XFloatDam extends XFloat implements IArtifactWidget { } catch (NumberFormatException ex) { // do nothing } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java index ebafbf96a93..90aecafaa63 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelGroupSelection.java @@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.HashSet; import java.util.Set; +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.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.GroupListDialog; import org.eclipse.swt.widgets.Display; @@ -72,7 +73,7 @@ public class XHyperlabelGroupSelection extends XHyperlinkLabelSelection { } return true; } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java index d293e6a7784..4261c23ea01 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelDam.java @@ -18,13 +18,13 @@ import java.util.regex.Pattern; import org.eclipse.osee.framework.db.connection.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.skynet.core.UserManager; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Composite; public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implements IArtifactWidget { @@ -79,7 +79,7 @@ public class XHyperlabelMemberSelDam extends XHyperlabelMemberSelection implemen artifact.setSoleAttributeValue(attributeTypeName, selectedStrValue); } } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java index df0203d91a5..ecede3f2162 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XHyperlabelMemberSelection.java @@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import java.util.HashSet; import java.util.Set; +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.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.dialog.UserCheckTreeDialog; import org.eclipse.swt.widgets.Display; @@ -63,7 +64,7 @@ public class XHyperlabelMemberSelection extends XHyperlinkLabelSelection { } return true; } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } return false; } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java index 1912782551f..7b279fce23f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XIntegerDam.java @@ -12,10 +12,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.osee.framework.db.connection.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; public class XIntegerDam extends XInteger implements IArtifactWidget { @@ -49,7 +50,7 @@ public class XIntegerDam extends XInteger implements IArtifactWidget { } catch (NumberFormatException ex) { // do nothing } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMultiXWidgetDam.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMultiXWidgetDam.java index e0501bd1a86..c95851d4b70 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMultiXWidgetDam.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/XMultiXWidgetDam.java @@ -11,10 +11,11 @@ package org.eclipse.osee.framework.ui.skynet.widgets; import org.eclipse.osee.framework.db.connection.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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.swt.widgets.Composite; public abstract class XMultiXWidgetDam extends XMultiXWidget implements IArtifactWidget { @@ -59,7 +60,7 @@ public abstract class XMultiXWidgetDam extends XMultiXWidget implements IArtifac try { createXWidgets(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } super.createWidgets(parent, horizontalSpan); } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetFactory.java index deb5e209105..ef2ce4677b0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetFactory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/AttributeXWidgetFactory.java @@ -14,10 +14,11 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.runtime.IConfigurationElement;
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.skynet.core.attribute.AttributeType;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.osgi.framework.Bundle;
/**
@@ -51,8 +52,8 @@ public class AttributeXWidgetFactory { Object obj = taskClass.newInstance();
widgetProviders.add((IAttributeXWidgetProvider) obj);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, "Error loading AttributeXWidgetProvider extension", ex,
- true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "Error loading AttributeXWidgetProvider extension", ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java index 64c3f681d65..1b5cde35ffd 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/DynamicXWidgetLayout.java @@ -20,11 +20,12 @@ import java.util.Set; import javax.xml.parsers.ParserConfigurationException; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; +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.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.XWidgetParser; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.IArtifactWidget; import org.eclipse.osee.framework.ui.skynet.widgets.XLabelDam; import org.eclipse.osee.framework.ui.skynet.widgets.XModifiedListener; @@ -137,7 +138,7 @@ public class DynamicXWidgetLayout { try { ((IArtifactWidget) xWidget).setArtifact(artifact, xWidgetLayoutData.getStorageName()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } if (toolkit != null) diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java index f0c619eb9d8..d9c375affc3 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkDefinitionProvider.java @@ -9,9 +9,10 @@ import java.util.ArrayList; import java.util.List;
import org.eclipse.core.runtime.IConfigurationElement;
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.util.OSEELog;
import org.osgi.framework.Bundle;
/**
@@ -37,8 +38,8 @@ public class WorkDefinitionProvider { Object obj = taskClass.newInstance();
workDefinitionProviders.add((IWorkDefinitionProvider) obj);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, "Error loading WorkDefinitionProvider extension", ex,
- true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "Error loading WorkDefinitionProvider extension", ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java index 82e671dce84..6d89799e33f 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/WorkFlowDefinition.java @@ -16,11 +16,11 @@ import java.util.Map.Entry; import java.util.logging.Level;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
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.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
/**
* @author Donald G. Dunne
@@ -236,11 +236,11 @@ public class WorkFlowDefinition extends WorkItemWithChildrenDefinition { for (String transition : artifact.getAttributesToStringList(WorkItemAttributes.TRANSITION.getAttributeTypeName())) {
String[] strs = transition.split(";");
if (strs.length != 3) {
- OSEELog.logException(
+ OseeLog.log(
SkynetGuiPlugin.class,
+ OseeLevel.SEVERE_POPUP,
new IllegalStateException(
- "Transition attribute from artifact " + artifact.getHumanReadableId() + " is invalid. Must be <fromState>;<transitionType>;<toState>"),
- false);
+ "Transition attribute from artifact " + artifact.getHumanReadableId() + " is invalid. Must be <fromState>;<transitionType>;<toState>"));
continue;
}
TransitionType transType = TransitionType.valueOf(strs[1]);
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java index 4719e0f1106..12ff8eff959 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/workflow/XWidgetFactory.java @@ -18,10 +18,10 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
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.skynet.core.attribute.BooleanAttribute;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.SkynetSpellModifyDictionary;
import org.eclipse.osee.framework.ui.skynet.widgets.XArtifactTypeListViewer;
import org.eclipse.osee.framework.ui.skynet.widgets.XAttributeTypeListViewer;
@@ -221,7 +221,7 @@ public class XWidgetFactory { IExtensionPoint point =
Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.osee.framework.ui.skynet.XWidgetProvider");
if (point == null) {
- OSEELog.logSevere(SkynetGuiPlugin.class, "Can't access XWidgetProvider extension point", true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, "Can't access XWidgetProvider extension point");
return null;
}
IExtension[] extensions = point.getExtensions();
@@ -240,7 +240,8 @@ public class XWidgetFactory { Object obj = taskClass.newInstance();
widgetProviders.add((IXWidgetProvider) obj);
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, "Error loading XWidgetProvider extension", ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP,
+ "Error loading XWidgetProvider extension", ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java index 37585a277f7..d4a5ae23ad1 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java @@ -22,6 +22,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.osee.framework.db.connection.exception.OseeArgumentException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Branch; import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; @@ -35,7 +36,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Jobs; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.SkynetViews; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -89,7 +89,7 @@ public class ChangeView extends ViewPart implements IActionable, IBranchEventLis changeView.explore(branch, transactionId, loadChangeReport); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -238,7 +238,7 @@ public class ChangeView extends ViewPart implements IActionable, IBranchEventLis try { explore(branch, transactionId, true); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java index 933879b4d67..e519cf553e0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeXViewer.java @@ -20,6 +20,8 @@ import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.nebula.widgets.xviewer.XViewer;
+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.skynet.core.artifact.Branch;
@@ -30,7 +32,6 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.preferences.EditorsPreferencePage;
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.OSEELog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TreeItem;
@@ -51,7 +52,7 @@ public class ChangeXViewer extends XViewer { try {
handleDoubleClick();
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
};
});
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java index 2546c66beac..c02bf27a319 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeLabelProvider.java @@ -15,9 +15,10 @@ import org.eclipse.nebula.widgets.xviewer.XViewerCells; import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; +import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.change.Change; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; -import org.eclipse.osee.framework.ui.skynet.widgets.xmerge.XMergeContentProvider; +import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; @@ -87,9 +88,9 @@ public class XChangeLabelProvider extends XViewerLabelProvider { try { return change.getItemKindImage(); } catch (IllegalArgumentException ex) { - OSEELog.logException(XMergeContentProvider.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } catch (Exception ex) { - OSEELog.logException(XMergeContentProvider.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } else if (xCol.equals(ChangeXViewerFactory.Item_Type)) { return change.getItemTypeImage(); diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java index c8293ba5725..c51b4f757a7 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/XChangeViewer.java @@ -23,6 +23,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
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.User;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -41,7 +42,6 @@ import org.eclipse.osee.framework.ui.skynet.ats.OseeAts; 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.status.SwtStatusMonitor;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.SkynetDragAndDrop;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
import org.eclipse.osee.framework.ui.swt.ALayout;
@@ -325,7 +325,7 @@ public class XChangeViewer extends XWidget implements IActionable { try {
refreshAssociatedArtifact();
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else {
extraInfoLabel.setText("Cleared on shut down - press refresh to reload");
@@ -333,7 +333,7 @@ public class XChangeViewer extends XWidget implements IActionable { }
});
} catch (OseeCoreException ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java index b9b26070f49..4d570ede11c 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; +import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.SkynetActivator; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -34,7 +35,6 @@ import org.eclipse.osee.framework.ui.plugin.util.Displays; import org.eclipse.osee.framework.ui.plugin.util.Jobs; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; import org.eclipse.osee.framework.ui.skynet.ats.IActionable; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -79,7 +79,7 @@ public class CommitManagerView extends ViewPart implements IActionable, IBranchE commitManagerView.explore(branchArtifact); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -135,7 +135,7 @@ public class CommitManagerView extends ViewPart implements IActionable, IBranchE ""); setPartName("Commit Manager: " + branchArtifact.getWorkingBranch().getBranchShortName()); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/XCommitViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/XCommitViewer.java index 4bca28d1865..8b0ac997a6b 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/XCommitViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/XCommitViewer.java @@ -17,12 +17,13 @@ import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; 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.skynet.core.artifact.Branch; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact; import org.eclipse.osee.framework.ui.skynet.widgets.XWidget; import org.eclipse.osee.framework.ui.swt.ALayout; @@ -179,7 +180,7 @@ public class XCommitViewer extends XWidget { if (artifact != null && (artifact instanceof IBranchArtifact)) xCommitViewer.setWorkingBranch(((IBranchArtifact) artifact).getWorkingBranch()); extraInfoLabel.setText("Commit Status for branch: \"" + ((IBranchArtifact) artifact).getWorkingBranch() + "\" - \"" + ((IBranchArtifact) artifact).getWorkingBranch().getBranchShortName() + "\""); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } refresh(); } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java index 18d0ec392d4..ea78e2c7ff4 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeUtility.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.db.connection.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.MultipleArtifactsExist;
import org.eclipse.osee.framework.jdk.core.util.AFile;
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.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactPersistenceManager;
@@ -38,11 +39,11 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionId; import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager;
import org.eclipse.osee.framework.ui.plugin.util.AIFile;
import org.eclipse.osee.framework.ui.plugin.util.Jobs;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
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.render.VbaWordDiffGenerator;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -283,7 +284,7 @@ public class MergeUtility { RendererManager.openInJob(attributeConflict.getArtifact(), PresentationType.SPECIALIZED_EDIT);
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
monitor.done();
return Status.OK_STATUS;
@@ -298,7 +299,7 @@ public class MergeUtility { }
}
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java index 36149f8dd7c..60f381846f6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java @@ -58,7 +58,6 @@ import org.eclipse.osee.framework.ui.skynet.ats.IActionable; import org.eclipse.osee.framework.ui.skynet.branch.BranchView;
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.OSEELog;
import org.eclipse.osee.framework.ui.skynet.util.SkynetViews;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -396,7 +395,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList attributeConflict.markStatusToReflectEdit();
}
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return null;
@@ -523,7 +522,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList }
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -662,7 +661,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList break;
}
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
@@ -745,7 +744,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList }
}
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return null;
}
@@ -797,7 +796,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList break;
}
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else if (conflicts.get(0) instanceof ArtifactConflict) {
@@ -827,7 +826,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList return false;
}
} catch (Exception ex) {
- OSEELog.logException(MergeView.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java index 295cd9bac3c..3b438bf2bfc 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeXViewer.java @@ -20,10 +20,12 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.nebula.widgets.xviewer.XViewer;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.db.connection.exception.MergeChangesInArtifactException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.mergeWizard.ConflictResolutionWizard;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
@@ -186,7 +188,7 @@ public class MergeXViewer extends XViewer { } catch (MergeChangesInArtifactException ex) {
MessageDialog.openError(shell, "Error", ex.getMessage());
} catch (Exception ex) {
- OSEELog.logException(MergeXViewer.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
xMergeViewer.loadTable();
return super.handleLeftClickInIconArea(treeColumn, treeItem);
@@ -200,7 +202,7 @@ public class MergeXViewer extends XViewer { try {
conWizard.setResolution();
} catch (Exception ex) {
- OSEELog.logException(MergeXViewer.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java index f0d877c43a9..22576e35cb8 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeLabelProvider.java @@ -14,9 +14,10 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.nebula.widgets.xviewer.XViewerColumn;
import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.conflict.Conflict;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
@@ -154,7 +155,7 @@ public class XMergeLabelProvider extends XViewerLabelProvider { if (conflict.statusInformational()) return SkynetGuiPlugin.getInstance().getImage(INFORMATION_IMAGE);
}
} catch (Exception ex) {
- OSEELog.logException(XMergeLabelProvider.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
return null;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java index 61e944e995b..6175cf7fac0 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/XMergeViewer.java @@ -26,6 +26,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.osee.framework.core.data.SystemUser;
import org.eclipse.osee.framework.db.connection.exception.OseeCoreException;
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.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -45,7 +46,6 @@ import org.eclipse.osee.framework.ui.skynet.artifact.editor.ArtifactEditor; import org.eclipse.osee.framework.ui.skynet.ats.IActionable;
import org.eclipse.osee.framework.ui.skynet.ats.OseeAts;
import org.eclipse.osee.framework.ui.skynet.status.SwtStatusMonitor;
-import org.eclipse.osee.framework.ui.skynet.util.OSEELog;
import org.eclipse.osee.framework.ui.skynet.widgets.XWidget;
import org.eclipse.osee.framework.ui.skynet.widgets.xchange.ChangeView;
import org.eclipse.osee.framework.ui.swt.ALayout;
@@ -201,7 +201,7 @@ public class XMergeViewer extends XWidget implements IActionable { }
AWorkbench.popup("ERROR", "Unknown branch association");
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
});
@@ -218,13 +218,13 @@ public class XMergeViewer extends XWidget implements IActionable { try {
ChangeView.open(conflicts[0].getSourceBranch());
} catch (Exception ex) {
- OSEELog.logException(XMergeViewer.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
} else {
try {
ChangeView.open(conflicts[0].getCommitTransactionId());
} catch (Exception ex) {
- OSEELog.logException(XMergeViewer.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -241,7 +241,7 @@ public class XMergeViewer extends XWidget implements IActionable { try {
ChangeView.open(conflicts[0].getDestBranch());
} catch (Exception ex) {
- OSEELog.logException(XMergeViewer.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -306,7 +306,7 @@ public class XMergeViewer extends XWidget implements IActionable { new String[] {"OK"}, 1).open();
}
} catch (OseeCoreException ex) {
- OSEELog.logException(XMergeViewer.class, ex, false);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
}
}
@@ -327,7 +327,7 @@ public class XMergeViewer extends XWidget implements IActionable { conflict.applyPreviousMerge(ConflictManagerInternal.getMergeBranchId(
conflict.getSourceBranch().getBranchId(), destBranchId), destBranchId);
} catch (OseeCoreException ex) {
- OSEELog.logException(XMergeViewer.class, ex, false);
+ OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
}
monitor.worked(1);
}
@@ -357,7 +357,7 @@ public class XMergeViewer extends XWidget implements IActionable { }
}
} catch (Exception ex) {
- OSEELog.logException(XMergeViewer.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
@@ -539,7 +539,7 @@ public class XMergeViewer extends XWidget implements IActionable { }
});
} catch (Exception ex) {
- OSEELog.logException(SkynetGuiPlugin.class, ex, true);
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
}
return Status.OK_STATUS;
}
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateComposite.java index 70bee57b763..dd0a9bc0eae 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateComposite.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateComposite.java @@ -14,8 +14,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xnavigate; import java.util.List; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.osee.framework.db.connection.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.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.util.filteredTree.OSEEFilteredTree; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.Browser; @@ -98,7 +99,7 @@ public class XNavigateComposite extends Composite { try { if (event.button == 1) handleDoubleClick(); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } }); @@ -111,7 +112,7 @@ public class XNavigateComposite extends Composite { try { handleDoubleClick(); } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } @@ -212,7 +213,7 @@ public class XNavigateComposite extends Composite { try { item.run(tableLoadOptions); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateUrlItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateUrlItem.java index f20719b9599..b711c4fda33 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateUrlItem.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xnavigate/XNavigateUrlItem.java @@ -11,8 +11,9 @@ package org.eclipse.osee.framework.ui.skynet.widgets.xnavigate; import java.net.URL; +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.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xnavigate.XNavigateComposite.TableLoadOption; import org.eclipse.swt.program.Program; import org.eclipse.ui.PlatformUI; @@ -56,7 +57,7 @@ public class XNavigateUrlItem extends XNavigateItemAction { IWebBrowser browser = browserSupport.createBrowser("osee.ats.navigator.browser"); browser.openURL(new URL(url)); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java index 79a56a99f58..2cc0cd2b1f6 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetUserArtifactCustomizeDefaults.java @@ -20,10 +20,10 @@ import org.eclipse.nebula.widgets.xviewer.customize.CustomizeData; import org.eclipse.osee.framework.db.connection.exception.AttributeDoesNotExist; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; 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.util.OSEELog; /** * This class provides the functionality necessary to store the user's defaults in their User Artifact @@ -95,7 +95,7 @@ public class SkynetUserArtifactCustomizeDefaults { } user.persistAttributes(); } catch (Exception ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } } diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java index ab2b2515477..99e8e53a92a 100644 --- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java +++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xviewer/skynet/SkynetXViewerFactory.java @@ -24,12 +24,12 @@ import org.eclipse.nebula.widgets.xviewer.customize.IXViewerCustomizations; import org.eclipse.nebula.widgets.xviewer.customize.XViewerCustomizations; import org.eclipse.osee.framework.db.connection.exception.OseeCoreException; import org.eclipse.osee.framework.db.connection.exception.OseeDataStoreException; +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.AttributeType; import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager; import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; -import org.eclipse.osee.framework.ui.skynet.util.OSEELog; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.OseeXViewerTreeReport; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerArtifactNameColumn; import org.eclipse.osee.framework.ui.skynet.widgets.xviewer.skynet.column.XViewerAttributeColumn; @@ -114,7 +114,7 @@ public class SkynetXViewerFactory extends XViewerFactory { attributeTypes.addAll(art.getAttributeTypes()); } } catch (OseeCoreException ex) { - OSEELog.logException(SkynetGuiPlugin.class, ex, true); + OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex); } Set<String> attrNames = new HashSet<String>(); // Add Name first |