Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrbrooks2010-09-14 19:06:49 -0400
committerRyan D. Brooks2010-09-14 19:06:49 -0400
commit12e7089c1c3e8d1010f057e829e30aa7ead7a703 (patch)
tree7e057f9300fb349c1ac09ccbac1864ab7e1492c9 /plugins
parent873a11cd7ffae414071f4b2620cc2d5ef3278666 (diff)
downloadorg.eclipse.osee-12e7089c1c3e8d1010f057e829e30aa7ead7a703.tar.gz
org.eclipse.osee-12e7089c1c3e8d1010f057e829e30aa7ead7a703.tar.xz
org.eclipse.osee-12e7089c1c3e8d1010f057e829e30aa7ead7a703.zip
refactor: Remove unnecessary exception OseeArbitrationServerException
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java5
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java9
-rw-r--r--plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java6
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArbitrationServerException.java31
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeAuthenticationRequiredException.java11
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DataStore.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DefaultAttributeDataProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/UriAttributeDataProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AbstractResourceProcessor.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AttributeURL.java15
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java12
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java3
13 files changed, 42 insertions, 86 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
index f1f1d43a16..a1acda8b2a 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
@@ -39,7 +39,6 @@ import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.data.OseeSessionGrant;
import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.util.HttpProcessor;
import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult;
@@ -154,7 +153,7 @@ public class InternalClientSessionManager {
}
}
- private void internalReleaseSession(String sessionId) throws OseeDataStoreException {
+ private void internalReleaseSession(String sessionId) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("operation", "release");
parameters.put("sessionId", sessionId);
@@ -166,7 +165,7 @@ public class InternalClientSessionManager {
oseeSession = null;
oseeSessionGrant = null;
} catch (Exception ex) {
- throw new OseeDataStoreException(ex);
+ OseeExceptions.wrapAndThrow(ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java
index 11a8bff103..7abbfd314f 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/OseeApplicationServer.java
@@ -33,8 +33,9 @@ import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient;
import org.eclipse.osee.framework.core.data.OseeCodeVersion;
import org.eclipse.osee.framework.core.data.OseeServerContext;
import org.eclipse.osee.framework.core.data.OseeServerInfo;
-import org.eclipse.osee.framework.core.exception.OseeArbitrationServerException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.core.util.HttpProcessor;
import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult;
import org.eclipse.osee.framework.jdk.core.util.Strings;
@@ -55,11 +56,9 @@ public class OseeApplicationServer {
private OseeApplicationServer() {
}
- public static String getOseeApplicationServer() throws OseeArbitrationServerException {
+ public static String getOseeApplicationServer() throws OseeCoreException {
checkAndUpdateStatus();
- if (Strings.isValid(oseeServer) != true) {
- throw new OseeArbitrationServerException("Invalid resource server address");
- }
+ Conditions.checkNotNullOrEmpty(oseeServer, "resource server address");
return oseeServer;
}
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java
index d85953cb8b..bac8004b1b 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/server/HttpUrlBuilderClient.java
@@ -17,7 +17,7 @@ import java.util.logging.Level;
import org.eclipse.osee.framework.core.client.CoreClientActivator;
import org.eclipse.osee.framework.core.client.OseeClientProperties;
import org.eclipse.osee.framework.core.client.internal.OseeApplicationServer;
-import org.eclipse.osee.framework.core.exception.OseeArbitrationServerException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.HttpUrlBuilder;
@@ -54,7 +54,7 @@ public class HttpUrlBuilderClient {
return String.format(urlPrefixFormat, HttpServer.getLocalServerAddress(), port);
}
- public String getApplicationServerPrefix() throws OseeDataStoreException, OseeArbitrationServerException {
+ public String getApplicationServerPrefix() throws OseeCoreException {
String address = OseeApplicationServer.getOseeApplicationServer();
if (address.endsWith("/") != true) {
address += "/";
@@ -70,7 +70,7 @@ public class HttpUrlBuilderClient {
return address;
}
- public String getOsgiServletServiceUrl(String context, Map<String, String> parameters) throws OseeDataStoreException {
+ public String getOsgiServletServiceUrl(String context, Map<String, String> parameters) throws OseeCoreException {
try {
return HttpUrlBuilder.createURL(getApplicationServerPrefix(), context, parameters);
} catch (UnsupportedEncodingException ex) {
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArbitrationServerException.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArbitrationServerException.java
deleted file mode 100644
index 09610e9945..0000000000
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/exception/OseeArbitrationServerException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Boeing.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Boeing - initial API and implementation
- *******************************************************************************/
-package org.eclipse.osee.framework.core.exception;
-
-/**
- * @author Roberto E. Escobar
- */
-public class OseeArbitrationServerException extends OseeDataStoreException {
-
- private static final long serialVersionUID = -1622659773564525533L;
-
- public OseeArbitrationServerException(String message) {
- super(message);
- }
-
- public OseeArbitrationServerException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public OseeArbitrationServerException(Throwable cause) {
- super(cause);
- }
-}
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 272d4d5191..bbcf803f34 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
@@ -17,16 +17,7 @@ public class OseeAuthenticationRequiredException extends OseeDataStoreException
private static final long serialVersionUID = 1890728724625261131L;
- public OseeAuthenticationRequiredException(String message, Throwable cause) {
- super(message, cause);
- }
-
public OseeAuthenticationRequiredException(String message) {
super(message);
}
-
- public OseeAuthenticationRequiredException(Throwable cause) {
- super(cause);
- }
-
-}
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java
index 0ec46ab32c..08b7c3540f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/AttributeResourceProcessor.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.attribute;
import java.net.MalformedURLException;
import java.net.URL;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
@@ -30,17 +30,17 @@ public class AttributeResourceProcessor extends AbstractResourceProcessor {
}
@Override
- protected URL getAcquireURL(DataStore dataToStore) throws OseeDataStoreException {
+ protected URL getAcquireURL(DataStore dataToStore) throws OseeCoreException {
return AttributeURL.getAcquireURL(dataToStore.getLocator());
}
@Override
- protected URL getDeleteURL(DataStore dataToStore) throws OseeDataStoreException {
+ protected URL getDeleteURL(DataStore dataToStore) throws OseeCoreException {
return AttributeURL.getDeleteURL(dataToStore.getLocator());
}
@Override
- protected URL getStorageURL(int seed, String name, String extension) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ protected URL getStorageURL(int seed, String name, String extension) throws OseeCoreException {
try {
return AttributeURL.getStorageURL(seed, name, extension);
} catch (MalformedURLException ex) {
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DataStore.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DataStore.java
index 88d5caef4e..92dea39059 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DataStore.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DataStore.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.attribute.providers;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.Arrays;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.skynet.core.attribute.utils.AbstractResourceProcessor;
@@ -53,11 +53,11 @@ public class DataStore {
return this.rawContent != null && this.rawContent.length > 0;
}
- public InputStream getInputStream() throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public InputStream getInputStream() throws OseeCoreException {
return new ByteArrayInputStream(getContent());
}
- public byte[] getContent() throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public byte[] getContent() throws OseeCoreException {
if (isLocatorValid() != false && needToReadFromRemote) {
resourceProcessor.acquire(this);
needToReadFromRemote = false;
@@ -78,7 +78,7 @@ public class DataStore {
other.encoding = this.encoding;
}
- public void persist(int storageId) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public void persist(int storageId) throws OseeCoreException {
if (this.rawContent != null && this.rawContent.length > 0) {
resourceProcessor.saveResource(storageId, resourceProcessor.createStorageName(), this);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DefaultAttributeDataProvider.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DefaultAttributeDataProvider.java
index b66edf80a4..15398680df 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DefaultAttributeDataProvider.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/DefaultAttributeDataProvider.java
@@ -12,9 +12,7 @@ package org.eclipse.osee.framework.skynet.core.attribute.providers;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
@@ -110,7 +108,7 @@ public class DefaultAttributeDataProvider extends AbstractAttributeDataProvider
}
@Override
- public void persist(int storageId) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public void persist(int storageId) throws OseeCoreException {
dataStore.persist(storageId);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/UriAttributeDataProvider.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/UriAttributeDataProvider.java
index 9811cea5eb..73a254e807 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/UriAttributeDataProvider.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/providers/UriAttributeDataProvider.java
@@ -15,9 +15,7 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.ByteBuffer;
import java.util.Arrays;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeWrappedException;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
@@ -133,7 +131,7 @@ public class UriAttributeDataProvider extends AbstractAttributeDataProvider impl
}
@Override
- public void persist(int storageId) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public void persist(int storageId) throws OseeCoreException {
dataStore.persist(storageId);
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AbstractResourceProcessor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AbstractResourceProcessor.java
index 975753caf3..80a6c949f2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AbstractResourceProcessor.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AbstractResourceProcessor.java
@@ -15,7 +15,7 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.util.HttpProcessor;
import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult;
@@ -27,15 +27,15 @@ import org.eclipse.osee.framework.skynet.core.attribute.providers.DataStore;
*/
public abstract class AbstractResourceProcessor {
- protected abstract URL getAcquireURL(DataStore dataStore) throws OseeDataStoreException, OseeAuthenticationRequiredException;
+ protected abstract URL getAcquireURL(DataStore dataStore) throws OseeCoreException;
- protected abstract URL getDeleteURL(DataStore dataStore) throws OseeDataStoreException, OseeAuthenticationRequiredException;
+ protected abstract URL getDeleteURL(DataStore dataStore) throws OseeCoreException;
- protected abstract URL getStorageURL(int seed, String name, String extension) throws OseeDataStoreException, OseeAuthenticationRequiredException;
+ protected abstract URL getStorageURL(int seed, String name, String extension) throws OseeCoreException;
public abstract String createStorageName() throws OseeDataStoreException;
- public void saveResource(int seed, String name, DataStore dataStore) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public void saveResource(int seed, String name, DataStore dataStore) throws OseeCoreException {
URL url = getStorageURL(seed, name, dataStore.getExtension());
InputStream inputStream = dataStore.getInputStream();
try {
@@ -48,7 +48,7 @@ public abstract class AbstractResourceProcessor {
}
}
- public void acquire(DataStore dataStore) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public void acquire(DataStore dataStore) throws OseeCoreException {
URL url = getAcquireURL(dataStore);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
AcquireResult result;
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AttributeURL.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AttributeURL.java
index 63ca4f31fe..340cec7206 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AttributeURL.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/utils/AttributeURL.java
@@ -18,8 +18,8 @@ import java.util.Map;
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;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+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;
/**
@@ -27,7 +27,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
*/
public class AttributeURL {
- public static URL getStorageURL(int gammaId, String artifactGuid, String extension) throws OseeDataStoreException, MalformedURLException, OseeAuthenticationRequiredException {
+ public static URL getStorageURL(int gammaId, String artifactGuid, String extension) throws OseeCoreException, MalformedURLException {
Map<String, String> parameterMap = new HashMap<String, String>();
parameterMap.put("sessionId", ClientSessionManager.getSessionId());
parameterMap.put("protocol", "attr");
@@ -41,7 +41,7 @@ public class AttributeURL {
return new URL(urlString);
}
- private static URL generatePathURL(String uri) throws OseeDataStoreException {
+ private static URL generatePathURL(String uri) throws OseeCoreException {
try {
Map<String, String> parameterMap = new HashMap<String, String>();
parameterMap.put("sessionId", ClientSessionManager.getSessionId());
@@ -51,15 +51,16 @@ public class AttributeURL {
parameterMap);
return new URL(urlString);
} catch (Exception ex) {
- throw new OseeDataStoreException(ex);
+ OseeExceptions.wrapAndThrow(ex);
+ return null; // unreachable because wrapAndThrow always throws an exception
}
}
- public static URL getAcquireURL(String uri) throws OseeDataStoreException {
+ public static URL getAcquireURL(String uri) throws OseeCoreException {
return generatePathURL(uri);
}
- public static URL getDeleteURL(String uri) throws OseeDataStoreException {
+ public static URL getDeleteURL(String uri) throws OseeCoreException {
return generatePathURL(uri);
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java
index c79a2bcbf5..3cf4377b8f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/exportImport/HttpBranchExchange.java
@@ -17,8 +17,8 @@ import java.util.logging.Level;
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;
-import org.eclipse.osee.framework.core.exception.OseeAuthenticationRequiredException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.util.HttpProcessor;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -30,7 +30,7 @@ public class HttpBranchExchange {
private static final String BRANCH_EXPORT = "exportBranch";
private static final String BRANCH_IMPORT = "importBranch";
- public static void exportBranches(String exportFileName, int... branchIds) throws OseeDataStoreException {
+ public static void exportBranches(String exportFileName, int... branchIds) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("function", BRANCH_EXPORT);
if (Strings.isValid(exportFileName)) {
@@ -40,7 +40,7 @@ public class HttpBranchExchange {
execute(parameters);
}
- public static void importBranches(String path, boolean cleanAllBeforeImport, boolean allAsRootBranches, int... branchIds) throws OseeDataStoreException, OseeAuthenticationRequiredException {
+ public static void importBranches(String path, boolean cleanAllBeforeImport, boolean allAsRootBranches, int... branchIds) throws OseeCoreException {
Map<String, String> parameters = new HashMap<String, String>();
parameters.put("sessionId", ClientSessionManager.getSessionId());
parameters.put("function", BRANCH_IMPORT);
@@ -58,14 +58,14 @@ public class HttpBranchExchange {
execute(parameters);
}
- private static void execute(Map<String, String> parameters) throws OseeDataStoreException {
+ private static void execute(Map<String, String> parameters) throws OseeCoreException {
try {
String returnVal =
HttpProcessor.post(new URL(HttpUrlBuilderClient.getInstance().getOsgiServletServiceUrl(
OseeServerContext.BRANCH_EXCHANGE_CONTEXT, parameters)));
OseeLog.log(HttpBranchExchange.class, Level.INFO, returnVal);
} catch (Exception ex) {
- throw new OseeDataStoreException(ex);
+ OseeExceptions.wrapAndThrow(ex);
}
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java
index b09a643348..d409b19eed 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.osee.framework.core.client.OseeClientProperties;
import org.eclipse.osee.framework.core.client.server.HttpUrlBuilderClient;
import org.eclipse.osee.framework.core.data.OseeCodeVersion;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
@@ -73,7 +74,7 @@ public class ArbitrationServerPage extends PreferencePage implements IWorkbenchP
String defaultApplicationServer = null;
try {
defaultApplicationServer = HttpUrlBuilderClient.getInstance().getApplicationServerPrefix();
- } catch (OseeDataStoreException ex) {
+ } catch (OseeCoreException ex) {
OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
}

Back to the top