Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2011-08-02 20:05:41 +0000
committerRyan D. Brooks2011-08-02 20:05:41 +0000
commit38f5425454f60d085a2ad10b340b63a5c1562378 (patch)
treee107545f9ee171f5fcbdcd32438f1c06fbd06858
parentdad30d551e147defe4d124ec94b7c6aa704b08cf (diff)
downloadorg.eclipse.osee-38f5425454f60d085a2ad10b340b63a5c1562378.tar.gz
org.eclipse.osee-38f5425454f60d085a2ad10b340b63a5c1562378.tar.xz
org.eclipse.osee-38f5425454f60d085a2ad10b340b63a5c1562378.zip
refactor: Use consistent method name, logf, in OseeLog
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/ValidateReviewManager.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/ConvertAtsDslToWorkDefinition.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/RuleManager.java2
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java2
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java4
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitCache.java2
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeIntegrity.java4
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java2
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java2
-rw-r--r--plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java2
-rw-r--r--plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/OseeLog.java10
-rw-r--r--plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/GuidBasedArtifactResolver.java2
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/NullBranchViewPresentationPreferences.java2
-rw-r--r--plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/model/ModelFinderService.java4
24 files changed, 33 insertions, 37 deletions
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/ValidateReviewManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/ValidateReviewManager.java
index 429960e2e7..7af4b02546 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/ValidateReviewManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/ValidateReviewManager.java
@@ -90,8 +90,8 @@ public class ValidateReviewManager {
TransitionManager transitionMgr = new TransitionManager(helper, transaction);
TransitionResults results = transitionMgr.handleAll();
if (!results.isEmpty()) {
- OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, null,
- "Error transitioning Decision review [%s] to Decision %s", decRev.toStringWithId(), results.toString());
+ OseeLog.logf(Activator.class, OseeLevel.SEVERE_POPUP,
+ "Error transitioning Decision review [%s] to Decision %s", decRev.toStringWithId(), results);
}
return decRev;
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java
index e8eaac6edd..dd56360fcb 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskResolutionOptionRule.java
@@ -83,7 +83,7 @@ public class TaskResolutionOptionRule {
AtsUtilCore.getAtsBranch());
return artifact.getSoleAttributeValue(CoreAttributeTypes.GeneralStringData, "");
} catch (ArtifactDoesNotExist ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex, "GeneralData artifact named [%s] does not exist",
+ OseeLog.logf(Activator.class, Level.SEVERE, ex, "GeneralData artifact named [%s] does not exist",
ruleDefinition.getName());
}
return "";
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/ConvertAtsDslToWorkDefinition.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/ConvertAtsDslToWorkDefinition.java
index 9590d4b405..319f77a4a5 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/ConvertAtsDslToWorkDefinition.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/ConvertAtsDslToWorkDefinition.java
@@ -255,7 +255,7 @@ public class ConvertAtsDslToWorkDefinition {
stateItems.add(widgetDef);
}
} catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, ex,
+ OseeLog.logf(Activator.class, Level.SEVERE, ex,
"Error resolving attribute [%s] to WorkDefinition in [%s]", attributeName, SHEET_NAME);
}
} else if (layoutItem instanceof Composite) {
@@ -419,7 +419,7 @@ public class ConvertAtsDslToWorkDefinition {
option = WidgetOption.valueOf(value);
widgetDef.getOptions().add(option);
} catch (IllegalArgumentException ex) {
- OseeLog.log(Activator.class, Level.WARNING, ex, "Unexpected value [%s] in WorkDefinition [%s] ", value,
+ OseeLog.logf(Activator.class, Level.WARNING, ex, "Unexpected value [%s] in WorkDefinition [%s] ", value,
SHEET_NAME);
}
}
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/RuleManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/RuleManager.java
index 4e07eec895..6069c8c0bc 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/RuleManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/RuleManager.java
@@ -29,7 +29,7 @@ public class RuleManager {
RuleDefinitionOption ruleOption = RuleDefinitionOption.valueOf(ruleId);
ruleMap.put(ruleId, new RuleDefinition(ruleOption));
} catch (Exception ex) {
- OseeLog.log(Activator.class, Level.SEVERE, null, "Unrecognized rule definition [%s]", ruleId);
+ OseeLog.logf(Activator.class, Level.SEVERE, "Unrecognized rule definition [%s]", ruleId);
}
}
return ruleMap.get(ruleId);
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java
index d951f748e8..976e8fd062 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionFactory.java
@@ -95,7 +95,7 @@ public class WorkDefinitionFactory {
match = WorkDefinitionFactoryLegacyMgr.getWorkFlowDefinitionFromReverseId(id);
}
if (match.isMatched()) {
- OseeLog.log(Activator.class, Level.INFO, null, "Loaded Work Definition [%s]", match);
+ OseeLog.logf(Activator.class, Level.INFO, "Loaded Work Definition [%s]", match);
workDefIdToWorkDefintion.put(id, match);
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java
index eb8802bdda..6993039deb 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReviewFormalTypeColumn.java
@@ -50,7 +50,7 @@ public class ReviewFormalTypeColumn extends XViewerAtsAttributeValueColumn {
try {
return ReviewFormalType.valueOf(value);
} catch (IllegalArgumentException ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex, "Unexpected formal type [%s]", value);
+ OseeLog.logf(AtsPlugin.class, Level.SEVERE, ex, "Unexpected formal type [%s]", value);
}
}
return null;
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
index cd9cd89500..4fea458a62 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
@@ -255,7 +255,7 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
StateXWidgetPage page = WorkflowManager.getCurrentAtsWorkPage(awa);
if (page == null) {
- OseeLog.log(AtsPlugin.class, OseeLevel.SEVERE_POPUP, null,
+ OseeLog.logf(AtsPlugin.class, OseeLevel.SEVERE_POPUP,
"Can't retrieve current page from current state [%s] of work definition [%s]", awa.getCurrentStateName(),
awa.getWorkDefinition().getName());
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
index d85135196f..d0eae246d6 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/AtsWorkDefinitionSheetProviders.java
@@ -86,7 +86,7 @@ public final class AtsWorkDefinitionSheetProviders {
public static void importWorkDefinitionSheets(XResultData resultData, boolean onlyWorkDefinitions, SkynetTransaction transaction, Artifact folder, Collection<WorkDefinitionSheet> sheets) throws OseeCoreException {
for (WorkDefinitionSheet sheet : sheets) {
if (isValidSheet(sheet)) {
- OseeLog.log(AtsPlugin.class, Level.INFO, null, "Importing ATS sheet [%s]", sheet.getName());
+ OseeLog.logf(AtsPlugin.class, Level.INFO, "Importing ATS sheet [%s]", sheet.getName());
Artifact artifact =
AtsWorkDefinitionProvider.get().importWorkDefinitionSheetToDb(sheet, resultData, onlyWorkDefinitions,
transaction);
@@ -103,7 +103,7 @@ public final class AtsWorkDefinitionSheetProviders {
new SkynetTransaction(AtsUtil.getAtsBranch(), "Import ATS AIs and Team Definitions");
for (WorkDefinitionSheet sheet : getWorkDefinitionSheets()) {
if (isValidSheet(sheet)) {
- OseeLog.log(AtsPlugin.class, Level.INFO, null, "Importing ATS AIs and Teams sheet [%s]", sheet.getName());
+ OseeLog.logf(AtsPlugin.class, Level.INFO, "Importing ATS AIs and Teams sheet [%s]", sheet.getName());
AtsWorkDefinitionProvider.get().importAIsAndTeamsToDb(sheet, transaction);
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java
index 1ed0c2b62d..e21432f7b4 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerEventManager.java
@@ -145,7 +145,7 @@ public class WorldXViewerEventManager {
handler.getWorldXViewer().remove(deletedPurgedArts.toArray(new Object[deletedPurgedArts.size()]));
}
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex, "Error processing event handler for deleted - %s",
+ OseeLog.logf(AtsPlugin.class, Level.SEVERE, ex, "Error processing event handler for deleted - %s",
handler);
}
}
@@ -167,7 +167,7 @@ public class WorldXViewerEventManager {
handler.relationsModifed(relModifiedArts);
}
} catch (Exception ex) {
- OseeLog.log(AtsPlugin.class, Level.SEVERE, ex, "Error processing event handler for - %s", handler);
+ OseeLog.logf(AtsPlugin.class, Level.SEVERE, ex, "Error processing event handler for - %s", handler);
}
}
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java
index 69c1824f10..9b2a070db2 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/DbWorkProductTaskProvider.java
@@ -83,7 +83,7 @@ public class DbWorkProductTaskProvider implements IWorkProductTaskProvider {
}
}
if (!found) {
- OseeLog.format(Activator.class, Level.SEVERE,
+ OseeLog.logf(Activator.class, Level.SEVERE,
"Invalid related WorkProductPcrGuid [%s] for Coverage Package [%s] on branch [%s]; ignoring.", guid,
coveragePackage.getName(), branch.getName());
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitCache.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitCache.java
index 22267a3960..c8b91c9c0e 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitCache.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/TestUnitCache.java
@@ -137,7 +137,7 @@ public class TestUnitCache implements ITestUnitProvider {
if (value != null) {
itemsToTestUnit.removeValue(coverageItem, value);
} else {
- OseeLog.format(Activator.class, Level.WARNING, "TestUnitName: [%s] is not associated with CoverageItem: [%s]",
+ OseeLog.logf(Activator.class, Level.WARNING, "TestUnitName: [%s] is not associated with CoverageItem: [%s]",
testUnitName, coverageItem.toString());
}
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeIntegrity.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeIntegrity.java
index fb47be7700..318e88d056 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeIntegrity.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeIntegrity.java
@@ -98,7 +98,7 @@ public class ExchangeIntegrity {
writer = openResults();
for (ReferentialIntegrityConstraint constraint : constraints) {
- OseeLog.format(Activator.class, Level.INFO, "Verifing constraint [%s]", constraint.getPrimaryKeyListing());
+ OseeLog.logf(Activator.class, Level.INFO, "Verifing constraint [%s]", constraint.getPrimaryKeyListing());
constraint.checkConstraint(services.getDatabaseService(), processor);
writeConstraintResults(writer, constraint);
}
@@ -108,7 +108,7 @@ public class ExchangeIntegrity {
} finally {
Lib.close(writer);
processor.cleanUp();
- OseeLog.format(Activator.class, Level.INFO, "Verified [%s] in [%s]", exportDataProvider.getExportedDataRoot(),
+ OseeLog.logf(Activator.class, Level.INFO, "Verified [%s] in [%s]", exportDataProvider.getExportedDataRoot(),
Lib.getElapseString(startTime));
}
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java
index 6ad9615716..03d536a694 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java
@@ -147,7 +147,7 @@ final class ExportController implements IExchangeTaskListener {
File target = new File(tempFolder.getParent(), getExchangeFileName());
if (!target.equals(tempFolder)) {
if (!tempFolder.renameTo(target)) {
- OseeLog.format(this.getClass(), Level.INFO, "Unable to move [%s] to [%s]",
+ OseeLog.logf(this.getClass(), Level.INFO, "Unable to move [%s] to [%s]",
tempFolder.getAbsolutePath(), target.getAbsolutePath());
}
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java
index f99b097303..a5bb6443b1 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java
@@ -137,7 +137,7 @@ public abstract class BaseDbSaxHandler extends BaseExportImportSaxHandler {
try {
getDatabaseService().runPreparedUpdate(connection, deleteSql);
} catch (OseeCoreException ex) {
- OseeLog.log(Activator.class, Level.INFO, ex, "Error clearing: %s", deleteSql);
+ OseeLog.logf(Activator.class, Level.INFO, ex, "Error clearing: %s", deleteSql);
throw ex;
}
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
index c0209e87d6..4f0c4ec110 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/HttpProcessor.java
@@ -105,7 +105,7 @@ public class HttpProcessor {
config.setProxy(data.getHost(), data.getPort());
}
}
- OseeLog.format(Activator.class, Level.INFO, "Http-Request: [%s] [%s]", requests++, uri.toASCIIString());
+ OseeLog.logf(Activator.class, Level.INFO, "Http-Request: [%s] [%s]", requests++, uri.toASCIIString());
}
public static String acquireString(URL url) throws Exception {
diff --git a/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java b/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java
index 4c31b776c7..a609860254 100644
--- a/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java
+++ b/plugins/org.eclipse.osee.framework.h2/src/org/eclipse/osee/framework/h2/H2DbServer.java
@@ -32,7 +32,7 @@ public class H2DbServer {
}
private void startServerInternal(String host, int port) throws Exception {
- OseeLog.format(H2DbServer.class, Level.INFO, "Starting H2 Database Server on [%s:%s]....", host, port);
+ OseeLog.logf(H2DbServer.class, Level.INFO, "Starting H2 Database Server on [%s:%s]....", host, port);
try {
nwServer = new H2DbServerUtil(InetAddress.getByName(host), port);
nwServer.start();
diff --git a/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/OseeLog.java b/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/OseeLog.java
index 364c854379..ef58148daf 100644
--- a/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/OseeLog.java
+++ b/plugins/org.eclipse.osee.framework.logging/src/org/eclipse/osee/framework/logging/OseeLog.java
@@ -55,18 +55,14 @@ public class OseeLog {
getLog().log(activatorClass.getName(), level, message, th);
}
- public static void log(Class<?> activatorClass, Level level, Throwable th, String message, Object... objects) {
- format(th, activatorClass, level, message, objects);
+ public static void logf(Class<?> activatorClass, Level level, Throwable th, String message, Object... objects) {
+ getLog().format(th, activatorClass.getName(), level, message, objects);
}
- public static void format(Class<?> activatorClass, Level level, String message, Object... objects) {
+ public static void logf(Class<?> activatorClass, Level level, String message, Object... objects) {
getLog().format(activatorClass.getName(), level, message, objects);
}
- public static void format(Throwable th, Class<?> activatorClass, Level level, String message, Object... objects) {
- getLog().format(th, activatorClass.getName(), level, message, objects);
- }
-
public static void registerLoggerListener(ILoggerListener listener) {
getLog().registerLoggerListener(listener);
}
diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java
index 4865592d00..e3c79050c6 100644
--- a/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java
+++ b/plugins/org.eclipse.osee.framework.messaging.event.res/src/org/eclipse/osee/framework/messaging/event/res/internal/OseeCoreModelEventServiceImpl.java
@@ -57,9 +57,9 @@ public class OseeCoreModelEventServiceImpl implements OseeMessagingStatusCallbac
public void sendRemoteEvent(RemoteEvent remoteEvent) throws OseeCoreException {
ResMessages resMessage = getResMessageType(remoteEvent);
if (resMessage == null) {
- OseeLog.log(Activator.class, Level.INFO, null, "ResEventManager: Unhandled remote event [%s]", resMessage);
+ OseeLog.logf(Activator.class, Level.INFO, "ResEventManager: Unhandled remote event [%s]", resMessage);
} else if (connectionNode == null) {
- OseeLog.log(Activator.class, Level.INFO, null,
+ OseeLog.logf(Activator.class, Level.INFO,
"ResEventManager: Connection node was null - unable to send remote event [%s]", resMessage);
} else {
connectionNode.send(resMessage, remoteEvent, this);
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java
index d2a86c8bd5..8ca279458e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/DirtyArtifactCacheTest.java
@@ -30,7 +30,7 @@ public class DirtyArtifactCacheTest {
"After all tests are run, there should be no dirty artifacts in Artifact Cache; Found [%s]",
Artifacts.getNames(dirtyArtifacts)), dirtyArtifacts.isEmpty());
for (Artifact artifact : dirtyArtifacts) {
- OseeLog.format(getClass(), Level.WARNING, "Name: %s Type: %s ", artifact.getName(),
+ OseeLog.logf(getClass(), Level.WARNING, "Name: %s Type: %s ", artifact.getName(),
artifact.getArtifactTypeName());
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/GuidBasedArtifactResolver.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/GuidBasedArtifactResolver.java
index 5cf7e2feaa..e5ba8ed51f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/GuidBasedArtifactResolver.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/GuidBasedArtifactResolver.java
@@ -42,7 +42,7 @@ public class GuidBasedArtifactResolver extends NewArtifactImportResolver {
Artifact realArtifact = null;
if (roughArtifact.getGuid() == null) {
- OseeLog.format(GuidBasedArtifactResolver.class, Level.INFO,
+ OseeLog.logf(GuidBasedArtifactResolver.class, Level.INFO,
"Guid based resolver is comparing a null GUID. roughArtifactifact: [%s]. Attributes: [%s]", roughArtifact,
roughArtifact.getAttributes());
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java
index 73749bf55a..d912671891 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/resolvers/NewArtifactImportResolver.java
@@ -37,7 +37,7 @@ public class NewArtifactImportResolver implements IArtifactImportResolver {
public Artifact resolve(final RoughArtifact roughArtifact, final IOseeBranch branch, Artifact realParent, Artifact root) throws OseeCoreException {
IArtifactType artifactType = getArtifactType(roughArtifact.getRoughArtifactKind());
- OseeLog.format(NewArtifactImportResolver.class, Level.INFO, "New artifact: [%s]. Attributes: [%s]",
+ OseeLog.logf(NewArtifactImportResolver.class, Level.INFO, "New artifact: [%s]. Attributes: [%s]",
roughArtifact, roughArtifact.getAttributes());
Artifact realArtifact =
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java
index 19257568dc..5f2f3bdc3c 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGenerator.java
@@ -111,7 +111,7 @@ public class VbaWordDiffGenerator implements IVbaDiffGenerator {
if (executeVbScript) {
executeScript(new File(compareData.getGeneratorScriptPath()));
} else {
- OseeLog.format(SkynetGuiPlugin.class, Level.INFO, "Test - Skip launch of [%s]",
+ OseeLog.logf(SkynetGuiPlugin.class, Level.INFO, "Test - Skip launch of [%s]",
compareData.getGeneratorScriptPath());
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/NullBranchViewPresentationPreferences.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/NullBranchViewPresentationPreferences.java
index 093b375802..96d9092610 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/NullBranchViewPresentationPreferences.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xBranch/NullBranchViewPresentationPreferences.java
@@ -168,7 +168,7 @@ public class NullBranchViewPresentationPreferences extends BranchViewPresentatio
}
private void showImproperStateMessage() {
- OseeLog.format(NullBranchViewPresentationPreferences.class, Level.SEVERE,
+ OseeLog.logf(NullBranchViewPresentationPreferences.class, Level.SEVERE,
"%s has not been properlly initialized.", BranchViewPresentationPreferences.class.getName());
}
}
diff --git a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/model/ModelFinderService.java b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/model/ModelFinderService.java
index 51cebff6db..67453c4fb6 100644
--- a/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/model/ModelFinderService.java
+++ b/plugins/org.eclipse.osee.ote.core/src/org/eclipse/osee/ote/core/model/ModelFinderService.java
@@ -40,7 +40,7 @@ public class ModelFinderService {
public void addModel(IModel newModel) {
try {
- OseeLog.log(ModelFinderService.class, Level.INFO, null, "### Adding model %s\n", newModel.getKey());
+ OseeLog.logf(ModelFinderService.class, Level.INFO, "### Adding model %s\n", newModel.getKey());
models.put(newModel.getKey(), newModel);
} catch (RemoteException ex) {
ex.printStackTrace();
@@ -49,7 +49,7 @@ public class ModelFinderService {
public void removeModel(IModel newModel) {
try {
- OseeLog.log(ModelFinderService.class, Level.INFO, null, "### Removing model %s\n", newModel.getKey());
+ OseeLog.logf(ModelFinderService.class, Level.INFO, "### Removing model %s\n", newModel.getKey());
models.remove(newModel.getKey());
} catch (RemoteException ex) {
ex.printStackTrace();

Back to the top