refactor: In BLAMs, use the BLAM log methods for logging
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java
index 3850e56..af68a80 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/TxImportedValidateChangeReports.java
@@ -75,7 +75,7 @@
private void setup(String databaseTargetId) throws OseeCoreException {
List<ImportedId> importtedIds = getImportedIds();
for (ImportedId importedId : importtedIds) {
- report(importedId.getSequence());
+ logf(importedId.getSequence());
importedId.load(databaseTargetId);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java
index 5f68156..edf08ea 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/notify/EmailActionsBlam.java
@@ -104,7 +104,7 @@
emailTheadPool.shutdown();
emailTheadPool.awaitTermination(100, TimeUnit.MINUTES);
for (Future<String> future : futures) {
- report(future.get());
+ logf(future.get());
}
}
@@ -114,7 +114,7 @@
assignees.addAll(awa.getStateMgr().getAssignees());
Collection<IBasicUser> activeEmailUsers = EmailUtil.getActiveEmailUsers(assignees);
if (assignees.isEmpty()) {
- report(String.format("No active assignees for workflow [%s].", awa.toStringWithId()));
+ logf("No active assignees for workflow [%s].", awa.toStringWithId());
return;
}
@@ -127,12 +127,12 @@
}
if (emailAddresses.isEmpty()) {
- report(String.format("No valid emails for workflow [%s].", awa.toStringWithId()));
+ logf("No valid emails for workflow [%s].", awa.toStringWithId());
return;
}
if (!EmailUtil.isEmailValid(UserManager.getUser())) {
- report(String.format("Can't email from user account [%s] cause email not valid.", UserManager.getUser()));
+ logf("Can't email from user account [%s] cause email not valid.", UserManager.getUser());
return;
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatus.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatus.java
index 782ffd5..cc165f3 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatus.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DetailedTestStatus.java
@@ -60,7 +60,6 @@
import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelXmlWriter;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ISheetWriter;
-import org.eclipse.osee.framework.logging.OseeLevel;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.AIFile;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
@@ -146,7 +145,7 @@
scriptsBranchWidget.setSelection(selectedBranch);
testProcedureBranchWidget.setSelection(selectedBranch);
} catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
}
@@ -174,7 +173,7 @@
versionsListViewer.addSelectionChangedListener(branchSelectionListener);
} catch (OseeCoreException ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
}
@@ -419,7 +418,7 @@
try {
statusLine[Index.RUN_DATE.ordinal()] = dateFormatter.format(runOperator.getEndDate());
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex);
+ log(ex);
}
if (runOperator.wasAborted()) {
statusLine[Index.TOTAL_TP.ordinal()] = "Aborted";
@@ -570,7 +569,7 @@
task.getSoleAttributeValue(AtsAttributeTypes.Resolution, ""));
requirementStatus.setTestPocs(task.getImplementers());
} else {
- System.out.println("odd task: " + task.getName());
+ logf("odd task: [%s]", task.getName());
}
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java
index 6940518..9fb9f20 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/DuplicateWorkflowBlam.java
@@ -109,8 +109,7 @@
handleCreateDuplicate(teamArts, duplicateTasks, title);
}
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
- return;
+ log(ex);
} finally {
AtsUtilCore.setEmailEnabled(true);
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java
index 6590a52..c4c5a4f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ImportTasksFromSpreadsheet.java
@@ -20,14 +20,11 @@
import org.eclipse.osee.ats.core.team.TeamWorkFlowArtifact;
import org.eclipse.osee.ats.core.type.AtsArtifactTypes;
import org.eclipse.osee.ats.editor.SMAEditor;
-import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsUtil;
import org.eclipse.osee.ats.util.Import.ExcelAtsTaskArtifactExtractor;
import org.eclipse.osee.ats.util.Import.TaskImportJob;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
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.plugin.core.util.Jobs;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -131,13 +128,13 @@
job.join();
transaction.execute();
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
return;
}
SMAEditor.editArtifact(artifact);
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
};
});
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java
index 526712f..4f4c4fa 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/PurgeUser.java
@@ -14,15 +14,12 @@
import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.OseeConnection;
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;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
@@ -92,7 +89,7 @@
// output results
displayReport(toUser, fromUser);
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
} finally {
numOfAuthoredTransactions = 0;
numOfASideRelations = 0;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java
index c0fb89d..7a9de61 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ReAssignATSObjectsToUser.java
@@ -16,10 +16,7 @@
import java.util.Set;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.core.workflow.AbstractWorkflowArtifact;
-import org.eclipse.osee.ats.internal.AtsPlugin;
import org.eclipse.osee.ats.util.AtsUtil;
-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;
@@ -95,7 +92,7 @@
Artifacts.persistInTransaction("Re-Assign ATS Objects to User", artsToReAssign);
OseeNotificationManager.getInstance().sendNotifications();
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
};
});
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java
index a052bc6..57d7f84 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/TaskMetrics.java
@@ -18,7 +18,6 @@
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
-import java.util.logging.Level;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.ats.core.config.TeamDefinitionArtifact;
@@ -42,7 +41,6 @@
import org.eclipse.osee.framework.jdk.core.util.io.CharBackedInputStream;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelXmlWriter;
import org.eclipse.osee.framework.jdk.core.util.io.xml.ISheetWriter;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.AIFile;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -213,7 +211,7 @@
}
} catch (OseeCoreException ex) {
- OseeLog.log(TaskMetrics.class, Level.SEVERE, ex.toString());
+ log(ex);
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java
index 6c05f81..41a3535 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/Import/ImportActionsViaSpreadsheetBlam.java
@@ -22,8 +22,6 @@
import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.PluginUtil;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
@@ -81,7 +79,7 @@
importActions(file, ImportOption.POPUP_ERROR_REPORT,
(emailPocs ? ImportOption.EMAIL_POCS : ImportOption.NONE));
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
} finally {
@@ -97,7 +95,7 @@
XResultData rd = extractor.dataIsValid();
if (!rd.toString().equals("")) {
if (popupReport) {
- XResultDataUI.report(rd,"Ats Action Import Errors");
+ XResultDataUI.report(rd, "Ats Action Import Errors");
}
} else {
SkynetTransaction transaction =
@@ -122,7 +120,7 @@
File file = getSampleSpreadsheetFile();
Program.launch(file.getCanonicalPath());
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
});
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java
index aea71f9..d1409f6 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/RequirementsTestReport.java
@@ -129,7 +129,7 @@
report.append(AHTML.endMultiColumnTable());
XResultData rd = new XResultData();
rd.addRaw(report.toString());
- XResultDataUI.report(rd,"Requirements Test Report", Manipulations.RAW_HTML);
+ XResultDataUI.report(rd, "Requirements Test Report", Manipulations.RAW_HTML);
}
private void init(VariableMap variableMap) throws OseeCoreException, IOException {
@@ -152,7 +152,7 @@
RelationManager.getRelatedArtifacts(requirementsBulkLoad, 1, CoreRelationTypes.Verification__Verifier);
Collection<Artifact> temp2 =
RelationManager.getRelatedArtifacts(temp, 1, CoreRelationTypes.Test_Unit_Result__Test_Result);
- System.out.println("Bulk loaded " + temp2.size() + " test results");
+ logf("Bulk loaded %d test results", temp2.size());
}
@Override
diff --git a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
index 547a72a..f710b08 100644
--- a/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
+++ b/plugins/org.eclipse.osee.define/src/org/eclipse/osee/define/traceability/blam/RemoveTraceMarksFromTraceUnits.java
@@ -18,7 +18,6 @@
import java.util.Collection;
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;
@@ -198,7 +197,7 @@
}
}
} catch (Exception ex) {
- OseeLog.log(DefinePlugin.class, Level.SEVERE, ex);
+ log(ex);
}
return handlers;
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java
index da47248..215092e 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java
@@ -32,8 +32,6 @@
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.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.XWidgetParser;
@@ -102,8 +100,8 @@
}
/**
- * Return collection of categories that blam belongs to eg: ATS, ATS.Admin, ATS.Report. These will be used to create
- * categories that blams are put into in UI navigators. BLAM can belong in multiple categories.
+ * Return collection of categories that blam belongs to. These will be used to create categories that blams are put
+ * into in UI navigators. BLAM can belong in multiple categories.
*/
public abstract Collection<String> getCategories();
@@ -156,17 +154,25 @@
databaseService = service;
}
- public void report(String... row) {
+ public void log(String... row) {
logger.log(row);
}
+ public void log(Throwable th) {
+ logger.log(th);
+ }
+
+ public void logf(String format, Object... args) {
+ logger.logf(format, args);
+ }
+
public void execute(OperationLogger logger, VariableMap variableMap, IJobChangeListener jobChangeListener) {
try {
this.logger = logger;
IOperation blamOperation = createOperation(variableMap, logger);
Operations.executeAsJob(blamOperation, true, Job.LONG, jobChangeListener);
} catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java
index 074c9a68..0eee6e5 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CheckDefaulHierarchy.java
@@ -41,10 +41,10 @@
for (Artifact artifact : artifacts) {
try {
if (!artifact.hasParent()) {
- report("\n" + artifact.getGuid() + " has no parent");
+ logf("\n" + artifact.getGuid() + " has no parent");
}
} catch (MultipleArtifactsExist ex) {
- report("\n" + ex.getLocalizedMessage());
+ logf("\n" + ex.getLocalizedMessage());
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java
index 3a64263..9e9b8d3 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CountArtifactsOfTypeBlam.java
@@ -56,7 +56,7 @@
ArtifactQuery.getArtifactCountFromTypeWithInheritence(artType, variableMap.getBranch("Branch"),
DeletionFlag.EXCLUDE_DELETED);
String str = String.format("\nAritfact Count for Type [%s] = %d\n\n", artType, count);
- report(str);
+ logf(str);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java
index 4cae81c..8e4b778 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/CreateNewUser.java
@@ -21,15 +21,12 @@
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.UserNotInDatabase;
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.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.render.PresentationType;
@@ -147,7 +144,7 @@
widgetXml +=
"<XWidget xwidgetType=\"XList(" + groupStr + ")\" displayName=\"Groups\" defaultValue=\"Everyone\"/>";
} catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
//
widgetXml += "</xWidgets>";
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java
index 5a10722..1670658 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/EmailGroupsBlam.java
@@ -25,8 +25,6 @@
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.util.Result;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.User;
import org.eclipse.osee.framework.skynet.core.UserManager;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -35,7 +33,6 @@
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.skynet.core.utility.EmailUtil;
import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.notify.OseeEmail;
@@ -113,7 +110,7 @@
emailTheadPool.shutdown();
emailTheadPool.awaitTermination(100, TimeUnit.MINUTES);
for (Future<String> future : futures) {
- report(future.get());
+ logf(future.get());
}
}
@@ -121,7 +118,7 @@
private void sendEmailTo(EmailGroupsData data, final User user) throws OseeCoreException {
final String emailAddress = user.getSoleAttributeValue(CoreAttributeTypes.Email, "");
if (!EmailUtil.isEmailValid(emailAddress)) {
- report(String.format("The email address \"%s\" for user %s is not valid.", emailAddress, user.getName()));
+ logf("The email address \"%s\" for user %s is not valid.", emailAddress, user.getName());
return;
}
final OseeEmail emailMessage = new OseeEmail(emailAddress, data.getSubject(), "", BodyType.Html);
@@ -193,7 +190,7 @@
data.getHtmlResult(UserManager.getUser()));
dialog.open();
} catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
@@ -240,7 +237,7 @@
templateList.setInputArtifacts(templates);
}
} catch (OseeCoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
index 5d47fce..4d8c85a 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/FixTemplateContentArtifacts.java
@@ -29,7 +29,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient;
import org.eclipse.osee.framework.core.data.OseeServerContext;
@@ -63,8 +62,6 @@
* @author Theron Virgin
*/
public class FixTemplateContentArtifacts extends AbstractBlam {
- private static final boolean DEBUG =
- Boolean.parseBoolean(Platform.getDebugOption("org.eclipse.osee.framework.ui.skynet/debug/Blam"));
private static final String GET_ATTRS =
"SELECT DISTINCT(art.human_readable_id), attr.gamma_id, attr.uri FROM osee_attribute attr, osee_artifact art WHERE attr.attr_type_id = ? AND attr.art_id = art.art_id AND attr.uri is not null AND attr.uri != ''";
@@ -90,8 +87,7 @@
return;
}
File backupFolder = createTempFolder();
- OseeLog.logf(SkynetGuiPlugin.class, Level.INFO,
- "Backup Folder location: [%s]", backupFolder.getAbsolutePath());
+ logf("Backup Folder location: [%s]", backupFolder.getAbsolutePath());
ArrayList<AttrData> attrDatas = loadAttrData();
int totalAttrs = attrDatas.size();
@@ -104,9 +100,6 @@
Resource resource = getResource(attrData.getUri());
Element rootElement = null;
- if (DEBUG) {
- OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, "Before Fix: %s", resource.data);
- }
final Collection<Element> elements = new LinkedList<Element>();
final Collection<Element> sectPr = new LinkedList<Element>();
@@ -138,8 +131,8 @@
}
} catch (Exception ex) {
badData.add(attrData.gammaId);
- OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE,
- "Skiping File %s because of exception %s", attrData.getHrid(), ex);
+ OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, "Skiping File %s because of exception %s",
+ attrData.getHrid(), ex);
}
if (fixedAttribute) {
@@ -154,12 +147,9 @@
// UploadResource
uploadResource(attrData.getGammaId(), resource);
- if (DEBUG) {
- OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, " After Fix : %s", resource.data);
- }
} catch (Exception ex) {
- OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE,
- "Skiping File %s because of exception %s", attrData.getHrid(), ex);
+ OseeLog.logf(SkynetGuiPlugin.class, Level.SEVERE, "Skiping File %s because of exception %s",
+ attrData.getHrid(), ex);
}
}
monitor.worked(1);
@@ -174,7 +164,7 @@
sbFull.append(AHTML.endMultiColumnTable());
XResultData rd = new XResultData();
rd.addRaw(sbFull.toString());
- XResultDataUI.report(rd,"Fix bad data", Manipulations.RAW_HTML);
+ XResultDataUI.report(rd, "Fix bad data", Manipulations.RAW_HTML);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java
index 0df8d10..ae00790 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ImageCaptureBlam.java
@@ -46,7 +46,7 @@
Displays.ensureInDisplayThread(new Runnable() {
@Override
public void run() {
- System.out.println("Starting Image Capture...");
+ log("Starting Image Capture...");
topLeftPoint = null;
botRightPoint = null;
Display.getDefault().addFilter(SWT.MouseUp, displayKeysListener);
@@ -59,10 +59,10 @@
if (event.type == SWT.MouseUp) {
if (topLeftPoint == null) {
topLeftPoint = event.display.getCursorLocation();
- report("\nFirst Mouse Event " + topLeftPoint);
+ logf("\nFirst Mouse Event " + topLeftPoint);
} else {
botRightPoint = event.display.getCursorLocation();
- report("Second Mouse Event " + botRightPoint);
+ logf("Second Mouse Event " + botRightPoint);
GC gc = new GC(Display.getCurrent());
Image image =
new Image(Display.getCurrent(), botRightPoint.x - topLeftPoint.x, botRightPoint.y - topLeftPoint.y);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java
index 8745a7e..a96808c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/PopulateUserGroupBlam.java
@@ -61,12 +61,12 @@
User user = emailToUser.get(emailAddress);
count++;
if (user == null) {
- report("User does not exist for: " + emailAddress);
+ logf("User does not exist for: " + emailAddress);
} else {
users.add(user);
}
}
- report("addresses: " + count);
+ logf("addresses: " + count);
SkynetTransaction transaction = new SkynetTransaction(BranchManager.getCommonBranch(), getName());
for (Artifact group : groups) {
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
index 70d13ea..40ca091 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
@@ -90,7 +90,7 @@
try {
type = RelationTypeManager.getType(typeSide.getFirst());
} catch (OseeTypeDoesNotExist ex) {
- report(String.format("Type [%s] on artifact [%s] does not exist\n", typeSide.getFirst(), art.getName()));
+ logf("Type [%s] on artifact [%s] does not exist\n", typeSide.getFirst(), art.getName());
return;
}
RelationSide side = RelationSide.fromString(typeSide.getSecond());
@@ -100,7 +100,7 @@
List<String> orderList = currentData.getOrderList(type, side);
List<String> actualOrder = Artifacts.toGuids(RelationManager.getRelatedArtifacts(art, type, side));
if (!orderList.equals(actualOrder)) {
- report(String.format("Incorrect order on %s (%s %s)\n", art.getName(), type, side));
+ logf("Incorrect order on %s (%s %s)\n", art.getName(), type, side);
currentData.storeFromGuids(type, side, RelationOrderBaseTypes.USER_DEFINED, actualOrder);
art.persist(transaction);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java
index bb99f04..c4bd712 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/SetWorkbenchOverrideIconBlam.java
@@ -19,7 +19,6 @@
import org.eclipse.osee.framework.core.client.ClientSessionManager;
import org.eclipse.osee.framework.jdk.core.util.Lib;
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.plugin.core.util.OseeData;
import org.eclipse.osee.framework.ui.skynet.FrameworkImage;
@@ -56,7 +55,7 @@
if (Strings.isValid(filename)) {
File imageFile = new File(filename);
if (!imageFile.exists()) {
- report("Invalid image filename.");
+ logf("Invalid image filename.");
}
try {
Image overrideImage = ImageDescriptor.createFromURL(imageFile.toURI().toURL()).createImage();
@@ -64,7 +63,7 @@
File overrideFile = OseeData.getFile("workbenchOverride.gif");
Lib.copyFile(imageFile, overrideFile);
} catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java
index 77e880e..5179006 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UniqueNumberOfCurrentOseeUsers.java
@@ -12,12 +12,9 @@
import java.util.Arrays;
import java.util.Collection;
-import java.util.logging.Level;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
-import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
@@ -46,7 +43,7 @@
try {
chStmt.runPreparedQuery(SELECT_USER_COUNT);
if (chStmt.next()) {
- OseeLog.log(SkynetGuiPlugin.class, Level.INFO, "active user count: " + chStmt.getInt("user_count"));
+ logf("active user count: %d" + chStmt.getInt("user_count"));
}
} finally {
chStmt.close();
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java
index 65e9440..513f1bb 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/UpdateArtifactTypeImage.java
@@ -21,10 +21,7 @@
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.ui.skynet.ArtifactImageManager;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.swt.Displays;
@@ -63,7 +60,7 @@
ArtifactImageManager.setArtifactTypeImageInDb(artifactSubtypeDescriptor, null);
}
} catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
});
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java
index 9137cb3..2cd0dc2 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/ValidateArtifactsToDelete.java
@@ -16,13 +16,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.osee.framework.core.util.XResultData;
-import org.eclipse.osee.framework.logging.OseeLevel;
-import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactChecks;
import org.eclipse.osee.framework.skynet.core.artifact.IArtifactCheck;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
-import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
import org.eclipse.osee.framework.ui.skynet.results.XResultDataUI;
@@ -63,15 +60,15 @@
rd.logError(result.getMessage());
}
} catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
rd.log("Exception occurred...see error log" + ex.getLocalizedMessage());
}
}
rd.log("\n");
rd.log("Validation Complete - Any errors will be displayed.");
- XResultDataUI.report(rd,"Validate Artifacts to Delete");
+ XResultDataUI.report(rd, "Validate Artifacts to Delete");
} catch (Exception ex) {
- OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, ex);
+ log(ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetsExampleBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetsExampleBlam.java
index 3d9f2b5..0887688 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetsExampleBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/XWidgetsExampleBlam.java
@@ -31,7 +31,7 @@
@Override
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
- report("Nothing to do here, this is only an example BLAM");
+ logf("Nothing to do here, this is only an example BLAM");
}
@Override
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java
index 80006b7..4af7312 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/sections/BlamOutputSection.java
@@ -14,6 +14,9 @@
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.osee.framework.core.operation.OperationLogger;
import org.eclipse.osee.framework.jdk.core.util.Collections;
+import org.eclipse.osee.framework.logging.OseeLevel;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.swt.Displays;
import org.eclipse.osee.framework.ui.swt.Widgets;
@@ -39,7 +42,7 @@
public BlamOutputSection(FormEditor editor, AbstractBlam abstractBlam, Composite parent, FormToolkit toolkit, int style, Action executBlamAction) {
super(editor, abstractBlam, parent, toolkit, style);
this.executBlamAction = executBlamAction;
- this.OperationLogger = new InternalReporter();
+ this.OperationLogger = new InternalLogger();
}
public void simluateRun() {
@@ -120,10 +123,15 @@
super.refresh();
}
- private final class InternalReporter extends OperationLogger {
+ private final class InternalLogger extends OperationLogger {
@Override
public void log(String... row) {
appendText(Collections.toString(", ", (Object[]) row) + "\n");
}
+
+ @Override
+ public void log(Throwable th) {
+ OseeLog.log(SkynetGuiPlugin.class, OseeLevel.SEVERE_POPUP, th);
+ }
}
}
\ No newline at end of file
