Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-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.database.test/src/org/eclipse/osee/framework/database/test/mocks/MockJoinAccessor.java152
-rw-r--r--plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java2
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java5
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/preferences/ArbitrationServerPage.java7
7 files changed, 84 insertions, 100 deletions
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 656f847f415..1b9edd7121f 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
@@ -34,7 +34,6 @@ 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.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;
@@ -127,12 +126,8 @@ public class OseeApplicationServer {
outputStream = new ByteArrayOutputStream();
AcquireResult result = HttpProcessor.acquire(new URL(url), outputStream);
- try {
- OseeLog.reportStatus(new BaseStatus(ArbitrationService, Level.INFO, "%s",
- HttpUrlBuilderClient.getInstance().getArbitrationServerPrefix()));
- } catch (OseeDataStoreException ex) {
- OseeLog.log(CoreClientActivator.class, Level.SEVERE, ex);
- }
+ OseeLog.reportStatus(new BaseStatus(ArbitrationService, Level.INFO, "%s",
+ HttpUrlBuilderClient.getInstance().getArbitrationServerPrefix()));
if (result.getCode() == HttpURLConnection.HTTP_OK) {
inputStream = new ByteArrayInputStream(outputStream.toByteArray());
oseeServerInfo = OseeServerInfo.fromXml(inputStream);
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 0cc809a7011..c50e6e22d22 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
@@ -18,7 +18,6 @@ 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.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.jdk.core.util.HttpUrlBuilder;
@@ -27,11 +26,12 @@ import org.eclipse.osee.framework.logging.OseeLog;
/**
* @author Roberto E. Escobar
*/
-public class HttpUrlBuilderClient {
+public final class HttpUrlBuilderClient {
private static final String urlPrefixFormat = "http://%s:%s/";
private static final HttpUrlBuilderClient instance = new HttpUrlBuilderClient();
private HttpUrlBuilderClient() {
+ // Singleton
}
public static HttpUrlBuilderClient getInstance() {
@@ -63,7 +63,7 @@ public class HttpUrlBuilderClient {
return address;
}
- public String getArbitrationServerPrefix() throws OseeDataStoreException {
+ public String getArbitrationServerPrefix() {
String address = OseeClientProperties.getOseeArbitrationServer();
if (address.endsWith("/") != true) {
address += "/";
diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/mocks/MockJoinAccessor.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/mocks/MockJoinAccessor.java
index a411eea5e21..bb1c0427afe 100644
--- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/mocks/MockJoinAccessor.java
+++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/test/mocks/MockJoinAccessor.java
@@ -1,79 +1,75 @@
-/*******************************************************************************
- * 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.database.test.mocks;
-
-import java.util.Collection;
-import java.util.List;
-import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.database.core.DatabaseJoinAccessor.JoinItem;
-import org.eclipse.osee.framework.database.core.IJoinAccessor;
-import org.eclipse.osee.framework.database.core.OseeConnection;
-
-/**
- * @author Roberto E. Escobar
- */
-public class MockJoinAccessor implements IJoinAccessor {
-
- private OseeConnection connection;
- private JoinItem joinItem;
- private int queryId;
- private List<Object[]> dataList;
-
- @SuppressWarnings("unused")
- @Override
- public void store(OseeConnection connection, JoinItem joinItem, int queryId, List<Object[]> dataList) throws OseeCoreException {
- this.connection = connection;
- this.joinItem = joinItem;
- this.queryId = queryId;
- this.dataList = dataList;
- }
-
- @SuppressWarnings("unused")
- @Override
- public int delete(OseeConnection connection, JoinItem joinItem, int queryId) throws OseeCoreException {
- this.connection = connection;
- this.joinItem = joinItem;
- this.queryId = queryId;
- return 0;
- }
-
- @SuppressWarnings("unused")
- @Override
- public Collection<Integer> getAllQueryIds(OseeConnection connection, JoinItem joinItem) throws OseeCoreException {
- this.connection = connection;
- this.joinItem = joinItem;
- return null;
- }
-
- public void clear() {
- connection = null;
- joinItem = null;
- dataList = null;
- queryId = -1;
- }
-
- public OseeConnection getConnection() {
- return connection;
- }
-
- public JoinItem getJoinItem() {
- return joinItem;
- }
-
- public int getQueryId() {
- return queryId;
- }
-
- public List<Object[]> getDataList() {
- return dataList;
- }
-
+/*******************************************************************************
+ * 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.database.test.mocks;
+
+import java.util.Collection;
+import java.util.List;
+import org.eclipse.osee.framework.database.core.DatabaseJoinAccessor.JoinItem;
+import org.eclipse.osee.framework.database.core.IJoinAccessor;
+import org.eclipse.osee.framework.database.core.OseeConnection;
+
+/**
+ * @author Roberto E. Escobar
+ */
+public class MockJoinAccessor implements IJoinAccessor {
+
+ private OseeConnection connection;
+ private JoinItem joinItem;
+ private int queryId;
+ private List<Object[]> dataList;
+
+ @Override
+ public void store(OseeConnection connection, JoinItem joinItem, int queryId, List<Object[]> dataList) {
+ this.connection = connection;
+ this.joinItem = joinItem;
+ this.queryId = queryId;
+ this.dataList = dataList;
+ }
+
+ @Override
+ public int delete(OseeConnection connection, JoinItem joinItem, int queryId) {
+ this.connection = connection;
+ this.joinItem = joinItem;
+ this.queryId = queryId;
+ return 0;
+ }
+
+ @Override
+ public Collection<Integer> getAllQueryIds(OseeConnection connection, JoinItem joinItem) {
+ this.connection = connection;
+ this.joinItem = joinItem;
+ return null;
+ }
+
+ public void clear() {
+ connection = null;
+ joinItem = null;
+ dataList = null;
+ queryId = -1;
+ }
+
+ public OseeConnection getConnection() {
+ return connection;
+ }
+
+ public JoinItem getJoinItem() {
+ return joinItem;
+ }
+
+ public int getQueryId() {
+ return queryId;
+ }
+
+ public List<Object[]> getDataList() {
+ return dataList;
+ }
+
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java
index 9b91f2a7d9d..b0f080d9e6c 100644
--- a/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java
+++ b/plugins/org.eclipse.osee.framework.database/src/org/eclipse/osee/framework/database/internal/core/OseeDatabaseServiceImpl.java
@@ -101,9 +101,8 @@ public class OseeDatabaseServiceImpl implements IOseeDatabaseService {
return new OseeStatementImpl(getDefaultConnectionPool(), (OseeConnectionImpl) connection, autoClose);
}
- @SuppressWarnings("unused")
@Override
- public IOseeStatement getStatement(int resultSetType, int resultSetConcurrency) throws OseeDataStoreException {
+ public IOseeStatement getStatement(int resultSetType, int resultSetConcurrency) {
throw new UnsupportedOperationException("This needs to be implemented");
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java
index 56703c2102d..bd8aa352e17 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java
@@ -349,7 +349,7 @@ public class RelationCacheTest {
}
}
- private static IArtifact createArtifact(int id, Branch branch) throws OseeCoreException {
+ private static IArtifact createArtifact(int id, Branch branch) {
return DataFactory.createArtifact(id, "Art-" + id, GUID.create(), branch);
}
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java
index 4bb120f20e3..cbcc25be168 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/XWidgetParser.java
@@ -62,7 +62,7 @@ public class XWidgetParser {
return data;
}
- public static List<DynamicXWidgetLayoutData> extractlayoutDatas(DynamicXWidgetLayout dynamicXWidgetLayout, Element xWidgets) throws OseeCoreException {
+ public static List<DynamicXWidgetLayoutData> extractlayoutDatas(DynamicXWidgetLayout dynamicXWidgetLayout, Element xWidgets) {
NodeList widgets = xWidgets.getElementsByTagName(DynamicXWidgetLayout.XWIDGET);
List<DynamicXWidgetLayoutData> layoutDatas = new ArrayList<DynamicXWidgetLayoutData>(widgets.getLength());
@@ -151,8 +151,7 @@ public class XWidgetParser {
return xmlData;
}
- @SuppressWarnings("unused")
- private static DynamicXWidgetLayoutData extractWorkAttribute(DynamicXWidgetLayout dynamicXWidgetLayout, Element widget) throws OseeCoreException {
+ private static DynamicXWidgetLayoutData extractWorkAttribute(DynamicXWidgetLayout dynamicXWidgetLayout, Element widget) {
DynamicXWidgetLayoutData dynamicXWidgetLayoutData = new DynamicXWidgetLayoutData(dynamicXWidgetLayout);
// Loop through attributes to ensure all are valid and processed
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 d409b19eed7..53ab363b094 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
@@ -18,7 +18,6 @@ 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;
import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
@@ -64,11 +63,7 @@ public class ArbitrationServerPage extends PreferencePage implements IWorkbenchP
boolean wasArbitrationOverriden = Strings.isValid(OseeClientProperties.getOseeApplicationServer());
String defaultArbitrationServer = null;
if (!wasArbitrationOverriden) {
- try {
- defaultArbitrationServer = HttpUrlBuilderClient.getInstance().getArbitrationServerPrefix();
- } catch (OseeDataStoreException ex) {
- OseeLog.log(SkynetGuiPlugin.class, Level.SEVERE, ex);
- }
+ defaultArbitrationServer = HttpUrlBuilderClient.getInstance().getArbitrationServerPrefix();
}
String defaultApplicationServer = null;

Back to the top