Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-09-14 16:54:49 +0000
committerRyan D. Brooks2010-09-14 16:54:49 +0000
commit74225843949515181df78245bfcb31147a805ba9 (patch)
tree93f998f89457d9df6ef5ace11c6127216d56bb47 /plugins/org.eclipse.osee.coverage/src
parentf0f991b4f728f2e7550016da91eb2e8d2c8c750c (diff)
downloadorg.eclipse.osee-74225843949515181df78245bfcb31147a805ba9.tar.gz
org.eclipse.osee-74225843949515181df78245bfcb31147a805ba9.tar.xz
org.eclipse.osee-74225843949515181df78245bfcb31147a805ba9.zip
refactor: Directly support String.format in OseeCoreException constructors
Diffstat (limited to 'plugins/org.eclipse.osee.coverage/src')
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateViewItems.java5
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java4
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java2
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java2
10 files changed, 15 insertions, 16 deletions
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java
index 54d4a62311b..f671550220b 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ConfigureCoverageMethodsAction.java
@@ -120,8 +120,8 @@ public class ConfigureCoverageMethodsAction extends Action {
Set<String> names = new HashSet<String>();
for (CoverageOption option : manager.get()) {
if (names.contains(option.getName())) {
- throw new OseeArgumentException(String.format("Multiple options with same name [%s]",
- option.getName()));
+ throw new OseeArgumentException("Multiple options with same name [%s]",
+ option.getName());
} else {
names.add(option.getName());
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java
index 42a2675d207..f06e75ba685 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java
@@ -120,7 +120,7 @@ public class CoverageEditorImportTab extends FormPage {
public void simulateImport(String importName) throws OseeCoreException {
if (!Strings.isValid(importName)) {
- throw new OseeStateException(String.format("Invalid importName [%s]", importName));
+ throw new OseeStateException("Invalid importName [%s]", importName);
}
AbstractCoverageBlam blam = null;
for (AbstractCoverageBlam abstractCoverageBlam : CoverageManager.getCoverageBlams()) {
@@ -129,7 +129,7 @@ public class CoverageEditorImportTab extends FormPage {
}
}
if (blam == null) {
- throw new OseeArgumentException(String.format("Can't find blam matching name [%s]", importName));
+ throw new OseeArgumentException("Can't find blam matching name [%s]", importName);
}
blam.setCoverageEditor(coverageEditor);
combo.getComboViewer().setSelection(new StructuredSelection(blam), true);
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java
index 65bb9c4dea7..33793a2bbc0 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemBase.java
@@ -42,7 +42,7 @@ public abstract class MergeItemBase extends NamedIdentity implements IMergeItem
@Override
public void setChecked(boolean checked) throws OseeArgumentException {
if (!isCheckable) {
- throw new OseeArgumentException(String.format("Merge Item is not checkable [%s]", this));
+ throw new OseeArgumentException("Merge Item is not checkable [%s]", this);
}
this.checked = checked;
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
index 1bcd956f197..1e41e63a45c 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java
@@ -106,7 +106,7 @@ public class CoverageImport extends CoveragePackageBase {
public void addImportRecordFile(File file) throws OseeArgumentException {
if (!file.exists()) {
- throw new OseeArgumentException(String.format("Import Record file [%s] doesn't exist.", file));
+ throw new OseeArgumentException("Import Record file [%s] doesn't exist.", file);
}
importRecordFiles.add(file);
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java
index 082c7466b33..7edd631a0d0 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java
@@ -61,7 +61,7 @@ public class CoverageItem extends NamedIdentity implements ICoverage, IWorkProdu
OseeExceptions.wrapAndThrow(ex);
}
if (!store.getId().equals(PROPERTY_STORE_ID)) {
- throw new OseeArgumentException(String.format("Invalid store id [%s] for CoverageItem", store.getId()));
+ throw new OseeArgumentException("Invalid store id [%s] for CoverageItem", store.getId());
}
CoverageItem item =
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateViewItems.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateViewItems.java
index e1340999a5e..9fe25bf448a 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateViewItems.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/navigate/CoverageNavigateViewItems.java
@@ -23,8 +23,8 @@ import org.eclipse.osee.coverage.action.NewCoveragePackageAction;
import org.eclipse.osee.coverage.action.OpenCoveragePackageAction;
import org.eclipse.osee.coverage.blam.AbstractCoverageBlam;
import org.eclipse.osee.coverage.util.CoverageUtil;
-import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.plugin.core.util.ExtensionPoints;
@@ -110,8 +110,7 @@ public class CoverageNavigateViewItems extends XNavigateViewItems {
}
data.add((ICoverageNavigateItem) object);
} catch (Exception ex) {
- throw new OseeArgumentException(String.format("Unable to Load: [%s - %s]" + ex.getLocalizedMessage(),
- bundleName, className));
+ OseeExceptions.wrapAndThrow(ex);
}
}
}
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java
index 4cad1c0a160..4558108a311 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/CoverageDataFile.java
@@ -37,8 +37,8 @@ public class CoverageDataFile {
this.coverageDataFilename = coverageDataFilename;
File coverageDataFile = getFile();
if (!coverageDataFile.exists()) {
- throw new OseeArgumentException(String.format("VectorCast coverage data file doesn't exist [%s]",
- coverageDataFilename));
+ throw new OseeArgumentException("VectorCast coverage data file doesn't exist [%s]",
+ coverageDataFilename);
}
String fileStr = AFile.readFile(coverageDataFile);
try {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java
index 6d6bbc81ec5..286d2e54e73 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastAggregateReport.java
@@ -41,8 +41,8 @@ public class VCastAggregateReport {
public List<AggregateCoverageUnitResult> getResults() throws OseeCoreException {
File reportHtmlFile = getFile();
if (!reportHtmlFile.exists()) {
- throw new OseeArgumentException(String.format(
- "VectorCast vcast_aggregate_coverage_report.html file doesn't exist [%s]", vcastDirectory));
+ throw new OseeArgumentException(
+ "VectorCast vcast_aggregate_coverage_report.html file doesn't exist [%s]", vcastDirectory);
}
List<AggregateCoverageUnitResult> results = new ArrayList<AggregateCoverageUnitResult>();
try {
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java
index 5b1fac2bcd7..837977b84ce 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VCastVcp.java
@@ -31,7 +31,7 @@ public class VCastVcp {
this.vcastDirectory = vcastDirectory;
File vCastVcpFile = getFile();
if (!vCastVcpFile.exists()) {
- throw new OseeArgumentException(String.format("VectorCast vcast.vcp file doesn't exist [%s]", vcastDirectory));
+ throw new OseeArgumentException("VectorCast vcast.vcp file doesn't exist [%s]", vcastDirectory);
}
VcpSourceFile vcpSourceFile = null;
VcpResultsFile vcpResultsFile = null;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java
index 187fafde970..ab129ea582d 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/vcast/VcpSourceLineFile.java
@@ -37,7 +37,7 @@ public class VcpSourceLineFile {
String lineFilename = vcastDirectory + "/vcast/LINE." + vcpSourceFile.getValue(SourceValue.UNIT_NUMBER);
resultsFile = new File(lineFilename);
if (!resultsFile.exists()) {
- throw new OseeArgumentException(String.format("VectorCast LINE.<num> file doesn't exist [%s]", lineFilename));
+ throw new OseeArgumentException("VectorCast LINE.<num> file doesn't exist [%s]", lineFilename);
}
}

Back to the top