Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java3
-rw-r--r--plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigRenderer.java3
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ArtifactDoesNotExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/AttributeDoesNotExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchDoesNotExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchMergeException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ItemDoesNotExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleArtifactsExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleAttributesExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleBranchesExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleItemsExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAccessDeniedException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArgumentException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationRequiredException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeCoreException.java45
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java4
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java34
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeNotFoundException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeStateException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeTypeDoesNotExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeWrappedException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/TransactionDoesNotExist.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserDataStoreException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserInDatabaseMultipleTimes.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserNotInDatabase.java5
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/exception/MalformedLocatorException.java5
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/AbstractBlam.java2
-rw-r--r--plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java3
35 files changed, 26 insertions, 210 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java
index 6ee9cd9bdaa..e66d3029658 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/editor/AtsWorkDefinitionDslRenderer.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.commands.Command;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osee.ats.AtsImage;
@@ -110,7 +109,7 @@ public final class AtsWorkDefinitionDslRenderer extends FileSystemRenderer {
IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
IDE.openEditor(page, file);
}
- } catch (CoreException ex) {
+ } catch (Exception ex) {
OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigRenderer.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigRenderer.java
index cf5db0955ac..f152da5287b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigRenderer.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/workdef/viewer/AtsWorkDefConfigRenderer.java
@@ -14,7 +14,6 @@ import static org.eclipse.osee.framework.ui.skynet.render.PresentationType.GENER
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.commands.Command;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osee.ats.AtsImage;
import org.eclipse.osee.ats.api.data.AtsArtifactTypes;
@@ -95,7 +94,7 @@ public class AtsWorkDefConfigRenderer extends DefaultArtifactRenderer {
} else {
AWorkbench.popup("No Work Definition matches artifact " + artifact.toStringWithId());
}
- } catch (CoreException ex) {
+ } catch (Exception ex) {
OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java
index 906d2c93b96..aefaf752f6d 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java
+++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/AbstractEditTest.java
@@ -13,7 +13,6 @@ package org.eclipse.osee.client.integration.tests.integration.ui.skynet;
import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Collections;
@@ -151,7 +150,7 @@ public abstract class AbstractEditTest {
Assert.assertTrue(listener.wasUpdateReceived());
}
- private String getRenderedStoredContent(FileSystemRenderer renderer, Artifact artifact) throws CoreException, IOException {
+ private String getRenderedStoredContent(FileSystemRenderer renderer, Artifact artifact) throws Exception {
Assert.assertNotNull(renderer);
Assert.assertNotNull(artifact);
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java
index 77d491a6b92..3f231aed402 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java
+++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java
@@ -19,7 +19,6 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.dsl.ui.integration.internal.DslUiIntegrationConstants;
@@ -126,7 +125,7 @@ public abstract class AbstractDslRenderer extends FileSystemRenderer {
}
@Override
- public final void open(final List<Artifact> artifacts, final PresentationType presentationType) throws OseeCoreException {
+ public final void open(final List<Artifact> artifacts, final PresentationType presentationType) {
Displays.ensureInDisplayThread(new Runnable() {
@Override
@@ -140,7 +139,7 @@ public abstract class AbstractDslRenderer extends FileSystemRenderer {
IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
IDE.openEditor(page, file);
}
- } catch (CoreException ex) {
+ } catch (Exception ex) {
OseeLog.log(DslUiIntegrationConstants.class, OseeLevel.SEVERE_POPUP, ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java
index 524462ceae9..2effa823b61 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeCoreExceptionTest.java
@@ -11,8 +11,6 @@
package org.eclipse.osee.framework.core.exception;
import org.junit.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.junit.Test;
/**
@@ -50,12 +48,6 @@ public class OseeCoreExceptionTest {
}
@Test
- public void testNullStatus() {
- Exception ex = new OseeCoreException((IStatus) null);
- Assert.assertEquals("Exception message unavaliable - status was null", ex.getMessage());
- }
-
- @Test
public void testMissingArguments() {
String messageFormat = "max = %d; min = %d; avg = %d";
Exception ex = new OseeCoreException(messageFormat, 1, 0);
diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java
index ccf71a17a50..2ef4c38e1b4 100644
--- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java
+++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java
@@ -10,11 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.junit.Assert;
-import org.eclipse.osee.framework.core.data.OseeCodeVersion;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeExceptions;
-import org.eclipse.osee.framework.core.exception.OseeWrappedException;
+import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -40,7 +37,6 @@ public class OseeExceptionsTest {
resultMessage = ex.getMessage();
}
Assert.assertNotNull(resultMessage);
- Assert.assertTrue(resultMessage.contains(OseeCodeVersion.getVersion()));
Assert.assertTrue(resultMessage.contains(test.getMethodName()));
}
@@ -55,7 +51,6 @@ public class OseeExceptionsTest {
resultMessage = ex.getMessage();
}
Assert.assertNotNull(resultMessage);
- Assert.assertTrue(resultMessage.contains(OseeCodeVersion.getVersion()));
Assert.assertTrue(resultMessage.contains(test.getMethodName()));
}
@@ -70,7 +65,6 @@ public class OseeExceptionsTest {
resultMessage = ex.getMessage();
}
Assert.assertNotNull(resultMessage);
- Assert.assertTrue(resultMessage.contains(OseeCodeVersion.getVersion()));
Assert.assertTrue(resultMessage.contains(test.getMethodName()));
}
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ArtifactDoesNotExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ArtifactDoesNotExist.java
index 1c52f998d70..5ac0806549b 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ArtifactDoesNotExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ArtifactDoesNotExist.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
@@ -23,10 +22,6 @@ public class ArtifactDoesNotExist extends OseeCoreException {
super(message, args);
}
- public ArtifactDoesNotExist(IStatus status) {
- super(status);
- }
-
public ArtifactDoesNotExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/AttributeDoesNotExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/AttributeDoesNotExist.java
index 57737a120e6..8af2413ef08 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/AttributeDoesNotExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/AttributeDoesNotExist.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
@@ -24,10 +23,6 @@ public class AttributeDoesNotExist extends OseeCoreException {
super(message, args);
}
- public AttributeDoesNotExist(IStatus status) {
- super(status);
- }
-
public AttributeDoesNotExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchDoesNotExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchDoesNotExist.java
index ff851994755..9ddd197dd04 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchDoesNotExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchDoesNotExist.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
@@ -22,10 +21,6 @@ public class BranchDoesNotExist extends OseeCoreException {
super(message, args);
}
- public BranchDoesNotExist(IStatus status) {
- super(status);
- }
-
public BranchDoesNotExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchMergeException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchMergeException.java
index 3fa73c2d925..5a12ca0035d 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchMergeException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/BranchMergeException.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
@@ -23,10 +22,6 @@ public class BranchMergeException extends OseeCoreException {
super(message, args);
}
- public BranchMergeException(IStatus status) {
- super(status);
- }
-
public BranchMergeException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ItemDoesNotExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ItemDoesNotExist.java
index c835aa69a99..a1bdfc177a4 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ItemDoesNotExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/ItemDoesNotExist.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Roberto E. Escobar
@@ -23,10 +22,6 @@ public class ItemDoesNotExist extends OseeCoreException {
super(message, args);
}
- public ItemDoesNotExist(IStatus status) {
- super(status);
- }
-
public ItemDoesNotExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleArtifactsExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleArtifactsExist.java
index f77daf3ef4c..4ec654e9fc3 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleArtifactsExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleArtifactsExist.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
@@ -23,10 +22,6 @@ public class MultipleArtifactsExist extends OseeCoreException {
super(message, args);
}
- public MultipleArtifactsExist(IStatus status) {
- super(status);
- }
-
public MultipleArtifactsExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleAttributesExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleAttributesExist.java
index f8fc2b8ce56..61844224adf 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleAttributesExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleAttributesExist.java
@@ -11,17 +11,12 @@
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
*/
public class MultipleAttributesExist extends OseeCoreException {
- public MultipleAttributesExist(IStatus status) {
- super(status);
- }
-
public MultipleAttributesExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleBranchesExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleBranchesExist.java
index 3cc6dde790c..99b73601ea7 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleBranchesExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleBranchesExist.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
@@ -23,10 +22,6 @@ public class MultipleBranchesExist extends OseeCoreException {
super(message, args);
}
- public MultipleBranchesExist(IStatus status) {
- super(status);
- }
-
public MultipleBranchesExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleItemsExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleItemsExist.java
index ef4a5b0d897..1ff8e13467b 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleItemsExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/MultipleItemsExist.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Roberto E. Escobar
@@ -23,10 +22,6 @@ public class MultipleItemsExist extends OseeCoreException {
super(message, args);
}
- public MultipleItemsExist(IStatus status) {
- super(status);
- }
-
public MultipleItemsExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAccessDeniedException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAccessDeniedException.java
index 275d68f36be..0fbe0be26ec 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAccessDeniedException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAccessDeniedException.java
@@ -10,17 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Roberto E. Escobar
*/
public class OseeAccessDeniedException extends OseeCoreException {
- public OseeAccessDeniedException(IStatus status) {
- super(status);
- }
-
public OseeAccessDeniedException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArgumentException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArgumentException.java
index 0f77fd2415a..d4df190f02a 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArgumentException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArgumentException.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
@@ -23,10 +22,6 @@ public class OseeArgumentException extends OseeCoreException {
super(message, args);
}
- public OseeArgumentException(IStatus status) {
- super(status);
- }
-
public OseeArgumentException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java
index 0aa056fda6d..1642e9686c2 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationException.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Roberto E. Escobar
@@ -34,11 +33,6 @@ public class OseeAuthenticationException extends OseeCoreException {
this.errorCode = null;
}
- public OseeAuthenticationException(IStatus status) {
- super(status);
- this.errorCode = null;
- }
-
public OseeAuthenticationException(String message, Throwable cause) {
super(message, cause);
this.errorCode = null;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationRequiredException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationRequiredException.java
index 283b9dff916..725158d879a 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationRequiredException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationRequiredException.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Roberto E. Escobar
@@ -23,10 +22,6 @@ public class OseeAuthenticationRequiredException extends OseeDataStoreException
super(message, args);
}
- public OseeAuthenticationRequiredException(IStatus status) {
- super(status);
- }
-
public OseeAuthenticationRequiredException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeCoreException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeCoreException.java
index 337bebde9e5..5b2665a9251 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeCoreException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeCoreException.java
@@ -10,43 +10,28 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.osee.framework.jdk.core.util.Collections;
/**
* @author Ryan D. Brooks
*/
-public class OseeCoreException extends CoreException {
+public class OseeCoreException extends RuntimeException {
private static final long serialVersionUID = 1L;
public OseeCoreException(String message, Object... args) {
- super(createSafeStatus(formatMessage(message, args), null));
+ super(formatMessage(message, args));
}
public OseeCoreException(String message, Throwable cause) {
- super(createSafeStatus(message, cause));
+ super(getMessage(message, cause), cause);
}
public OseeCoreException(Throwable cause, String message, Object... args) {
- super(createSafeStatus(formatMessage(message, args), cause));
+ super(formatMessage(message, args), cause);
}
public OseeCoreException(Throwable cause) {
- super(createSafeStatus(null, cause));
- }
-
- public OseeCoreException(IStatus status) {
- super(safeStatus(status));
- }
-
- private static IStatus safeStatus(IStatus status) {
- IStatus toReturn = status;
- if (toReturn == null) {
- toReturn = createSafeStatus("Exception message unavaliable - status was null", null);
- }
- return toReturn;
+ super(cause);
}
private static String formatMessage(String message, Object... args) {
@@ -59,18 +44,14 @@ public class OseeCoreException extends CoreException {
}
}
- private static IStatus createSafeStatus(String message, Throwable cause) {
- IStatus status = null;
- if (message != null && cause != null) {
- status = new Status(IStatus.ERROR, "OSEE", message, cause);
- } else if (cause != null) {
- status = new Status(IStatus.ERROR, "OSEE", cause.getMessage(), cause);
- } else if (message != null) {
- status = new Status(IStatus.ERROR, "OSEE", message);
- } else {
- status =
- new Status(IStatus.ERROR, "OSEE", "Exception message unavaliable - both exception and message were null");
+ private static final String getMessage(String message, Throwable cause) {
+ if (message == null) {
+ if (cause == null) {
+ message = "Exception message unavaliable - both exception and message were null";
+ } else {
+ message = cause.getLocalizedMessage();
+ }
}
- return status;
+ return message;
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java
index 7643b707619..e559681ee98 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeDataStoreException.java
@@ -10,15 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
*/
public class OseeDataStoreException extends OseeCoreException {
- public OseeDataStoreException(IStatus status) {
- super(status);
- }
public OseeDataStoreException(String message, Throwable cause) {
super(message, cause);
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java
index ec758100a1d..260636435e0 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeExceptions.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import java.lang.reflect.Constructor;
-import org.eclipse.osee.framework.core.data.OseeCodeVersion;
/**
* {@link OseeExceptionsTest}
@@ -26,34 +24,10 @@ public final class OseeExceptions {
// private empty constructor is to prevent external instantiation
}
- public static void wrapAndThrow(Throwable ex) throws OseeCoreException {
- String value = ex != null ? ex.getMessage() : "";
- String finalMsg = String.format(MSG, OseeCodeVersion.getVersion(), value);
- if (ex instanceof RuntimeException) {
- RuntimeException exception = new RuntimeException(finalMsg, ex);
- throw exception;
- } else if (ex instanceof OseeCoreException) {
- throw appendMessage(finalMsg, (OseeCoreException) ex);
- } else {
- throw new OseeWrappedException(finalMsg, ex);
+ public static void wrapAndThrow(Throwable throwable) throws OseeCoreException {
+ if (throwable instanceof RuntimeException) {
+ throw (RuntimeException) throwable;
}
- }
-
- private static OseeCoreException appendMessage(String message, OseeCoreException ex) {
- OseeCoreException exception;
- try {
- Constructor<? extends OseeCoreException> constructor =
- ex.getClass().getConstructor(String.class, Throwable.class);
- exception = constructor.newInstance(message, ex);
- } catch (Throwable th1) {
- try {
- Constructor<? extends OseeCoreException> constructor =
- ex.getClass().getConstructor(Throwable.class, String.class);
- exception = constructor.newInstance(message, ex);
- } catch (Throwable th2) {
- exception = new OseeCoreException(message, ex);
- }
- }
- return exception;
+ throw new OseeCoreException(throwable);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java
index 26ae99dff37..7963d5ed1d6 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeInvalidInheritanceException.java
@@ -10,14 +10,9 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
public class OseeInvalidInheritanceException extends OseeCoreException {
- public OseeInvalidInheritanceException(IStatus status) {
- super(status);
- }
-
public OseeInvalidInheritanceException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeNotFoundException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeNotFoundException.java
index 075bbe25c8b..1d6c69e1835 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeNotFoundException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeNotFoundException.java
@@ -10,17 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
*/
public class OseeNotFoundException extends OseeCoreException {
- public OseeNotFoundException(IStatus status) {
- super(status);
- }
-
public OseeNotFoundException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeStateException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeStateException.java
index 6defbb961eb..94e4b376d2e 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeStateException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeStateException.java
@@ -10,17 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Donald G. Dunne
*/
public class OseeStateException extends OseeCoreException {
- public OseeStateException(IStatus status) {
- super(status);
- }
-
public OseeStateException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeTypeDoesNotExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeTypeDoesNotExist.java
index 53563407a50..046c0f97715 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeTypeDoesNotExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeTypeDoesNotExist.java
@@ -10,17 +10,12 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
*/
public class OseeTypeDoesNotExist extends OseeCoreException {
- public OseeTypeDoesNotExist(IStatus status) {
- super(status);
- }
-
public OseeTypeDoesNotExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeWrappedException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeWrappedException.java
index 1cd45873f82..1609c931b28 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeWrappedException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeWrappedException.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
@@ -26,10 +25,6 @@ public class OseeWrappedException extends OseeCoreException {
super(cause);
}
- public OseeWrappedException(IStatus status) {
- super(status);
- }
-
public OseeWrappedException(String message, Object... args) {
super(message, args);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/TransactionDoesNotExist.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/TransactionDoesNotExist.java
index 0cde78f3ef4..b8a7533eddd 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/TransactionDoesNotExist.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/TransactionDoesNotExist.java
@@ -10,16 +10,11 @@
*******************************************************************************/
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
*/
public class TransactionDoesNotExist extends OseeCoreException {
- public TransactionDoesNotExist(IStatus status) {
- super(status);
- }
-
public TransactionDoesNotExist(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserDataStoreException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserDataStoreException.java
index c3f4c2dc29d..fdd218df0f5 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserDataStoreException.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserDataStoreException.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Roberto E. Escobar
@@ -20,10 +19,6 @@ public class UserDataStoreException extends OseeCoreException {
private static final long serialVersionUID = 6332029869706688372L;
- public UserDataStoreException(IStatus status) {
- super(status);
- }
-
public UserDataStoreException(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserInDatabaseMultipleTimes.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserInDatabaseMultipleTimes.java
index 534ebc0090d..cb8b903c1a9 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserInDatabaseMultipleTimes.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserInDatabaseMultipleTimes.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
@@ -21,10 +20,6 @@ public class UserInDatabaseMultipleTimes extends UserDataStoreException {
private static final long serialVersionUID = 5497730793552605424L;
- public UserInDatabaseMultipleTimes(IStatus status) {
- super(status);
- }
-
public UserInDatabaseMultipleTimes(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserNotInDatabase.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserNotInDatabase.java
index 297ef90d562..deef5f84a69 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserNotInDatabase.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/UserNotInDatabase.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.core.exception;
-import org.eclipse.core.runtime.IStatus;
/**
* @author Ryan D. Brooks
@@ -21,10 +20,6 @@ public class UserNotInDatabase extends UserDataStoreException {
private static final long serialVersionUID = -676895641120036141L;
- public UserNotInDatabase(IStatus status) {
- super(status);
- }
-
public UserNotInDatabase(String message, Throwable cause) {
super(message, cause);
}
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/exception/MalformedLocatorException.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/exception/MalformedLocatorException.java
index b5a659bf202..c458a228950 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/exception/MalformedLocatorException.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/exception/MalformedLocatorException.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.osee.framework.resource.management.exception;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
/**
@@ -32,10 +31,6 @@ public class MalformedLocatorException extends OseeCoreException {
super(cause);
}
- public MalformedLocatorException(IStatus status) {
- super(status);
- }
-
public MalformedLocatorException(Throwable cause, String message, Object... args) {
super(cause, message, args);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
index 3633b885ea4..65d00894e1c 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactTypeManager.java
@@ -190,7 +190,7 @@ public class ArtifactTypeManager {
* @param purgeArtifactTypes types to be converted and purged
* @param newArtifactType new type to convert any existing artifacts of the old type
*/
- public static void purgeArtifactTypesWithCheck(Collection<? extends IArtifactType> purgeArtifactTypes, IArtifactType newArtifactType) throws CoreException {
+ public static void purgeArtifactTypesWithCheck(Collection<? extends IArtifactType> purgeArtifactTypes, IArtifactType newArtifactType) throws CoreException, OseeCoreException {
for (IArtifactType purgeArtifactType : purgeArtifactTypes) {
// find all artifact of this type on all branches and make a unique list for type change (since it is not by branch)
Set<Artifact> artifacts = new LinkedHashSet<Artifact>();
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 e0c53970d9c..6d7c98d8742 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
@@ -184,7 +184,7 @@ public abstract class AbstractBlam implements IDynamicWidgetLayoutListener {
}
@SuppressWarnings("unused")
- public List<XWidgetRendererItem> getLayoutDatas() throws IllegalArgumentException, ParserConfigurationException, SAXException, IOException, CoreException {
+ public List<XWidgetRendererItem> getLayoutDatas() throws IllegalArgumentException, ParserConfigurationException, SAXException, IOException, CoreException, OseeCoreException {
return XWidgetParser.extractWorkAttributes(new SwtXWidgetRenderer(), getXWidgetsXml());
}
diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
index 0e0ce40f9ab..21b80af5f9f 100644
--- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
+++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/relation/order/OrderParserTest.java
@@ -29,7 +29,6 @@ import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.orcs.data.RelationTypes;
import org.junit.Before;
@@ -136,7 +135,7 @@ public class OrderParserTest {
@Test
public void testInvalidXml() throws OseeCoreException {
- thrown.expect(OseeWrappedException.class);
+ thrown.expect(OseeCoreException.class);
parser.loadFromXml(hasOrderData, "<OrderList");
verify(hasOrderData, never()).add(typeSideCaptor.capture(), orderDataCaptor.capture());
}

Back to the top