refactor: Utilize utility method OseeExceptions.wrapAndThrow instead of in-place code

6 files changed, 19 insertions, 19 deletions

diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
index 7a7a7cbd89c..ec1272150ed 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
@@ -18,7 +18,6 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osee.framework.access.AccessControlManager;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.plugin.core.IActionable;
@@ -98,7 +97,7 @@ public class AdminView extends ViewPart implements IActionable {
          public void run() {
             try {
                DbTableTab.refresh();
-            } catch (OseeDataStoreException ex) {
+            } catch (OseeCoreException ex) {
                OseeLog.log(AdminView.class, Level.SEVERE, ex);
             }
          }
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java
index c1309d79a1b..a2071220194 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbDescribe.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
 
@@ -28,7 +28,7 @@ public class DbDescribe {
       this.dbColumns = null;
    }
 
-   public int indexOfColumn(String name) throws OseeDataStoreException {
+   public int indexOfColumn(String name) throws OseeCoreException {
       int toReturn = -1;
       List<Describe> items = getDescription();
       for (int index = 0; index < items.size(); index++) {
@@ -40,7 +40,7 @@ public class DbDescribe {
       return toReturn;
    }
 
-   public List<Describe> getDescription() throws OseeDataStoreException {
+   public List<Describe> getDescription() throws OseeCoreException {
       if (dbColumns == null) {
          dbColumns = new ArrayList<Describe>();
          IOseeStatement chStmt = ConnectionHandler.getStatement();
@@ -63,7 +63,7 @@ public class DbDescribe {
       return dbColumns;
    }
 
-   public DbTaskList getDbTaskList(List<Describe> describeList) throws OseeDataStoreException {
+   public DbTaskList getDbTaskList(List<Describe> describeList) throws OseeCoreException {
       DbTaskList taskList = new DbTaskList();
       IOseeStatement chStmt = ConnectionHandler.getStatement();
       try {
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java
index 47efde06dcf..e09196570ab 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableTab.java
@@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.admin.dbtabletab;
 
 import java.util.ArrayList;
 import java.util.logging.Level;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.ui.admin.AdminPlugin;
@@ -75,7 +75,7 @@ public class DbTableTab {
          public void modifyText(ModifyEvent e) {
             try {
                handleTableSelect();
-            } catch (OseeDataStoreException ex) {
+            } catch (OseeCoreException ex) {
                OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
             }
             AdminView.setSaveNeeded(false);
@@ -181,7 +181,7 @@ public class DbTableTab {
       return null;
    }
 
-   public void handleTableSelect() throws OseeDataStoreException {
+   public void handleTableSelect() throws OseeCoreException {
       if (dbTableViewer != null) {
          dbTableViewer.dispose();
       }
@@ -195,7 +195,7 @@ public class DbTableTab {
       parent.layout();
    }
 
-   public static void refresh() throws OseeDataStoreException {
+   public static void refresh() throws OseeCoreException {
       if (filterCombo.get().equals("")) {
          return;
       }
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java
index 2df2f68cc70..404b4f281e1 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/DbTableViewer.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.admin.AdminView;
 import org.eclipse.osee.framework.ui.admin.dbtabletab.DbDescribe.Describe;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -59,7 +59,7 @@ public class DbTableViewer {
    private DbDescribe dbDescribe;
    private final DbItem dbItem;
 
-   public DbTableViewer(Composite parent, int numColumns, DbTableTab dbTab, DbItem dbItem) throws OseeDataStoreException {
+   public DbTableViewer(Composite parent, int numColumns, DbTableTab dbTab, DbItem dbItem) throws OseeCoreException {
       this.dbTab = dbTab;
       this.dbItem = dbItem;
       getTableDescription();
@@ -204,7 +204,7 @@ public class DbTableViewer {
 
    }
 
-   public void getTableDescription() throws OseeDataStoreException {
+   public void getTableDescription() throws OseeCoreException {
       dbDescribe = new DbDescribe(dbItem);
       describeList = dbDescribe.getDescription();
    }
@@ -212,7 +212,7 @@ public class DbTableViewer {
    /**
     * Load table with administration items
     */
-   public void load() throws OseeDataStoreException {
+   public void load() throws OseeCoreException {
       dbTaskList = dbDescribe.getDbTaskList(describeList);
       tableViewer.setInput(dbTaskList);
       refresh();
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java
index 7a74be126cd..b2b5f9c8f9e 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/OseeInfoDbItem.java
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.osee.framework.ui.admin.dbtabletab;
 
-import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.database.core.IOseeStatement;
 import org.eclipse.osee.framework.logging.OseeLevel;
@@ -50,7 +50,7 @@ public class OseeInfoDbItem extends DbItem {
          String query = "SELECT * FROM " + getTableName() + " WHERE OSEE_KEY = " + returnTic(key);
          chStmt.runPreparedQuery(query);
          toReturn = chStmt.next();
-      } catch (OseeDataStoreException ex) {
+      } catch (OseeCoreException ex) {
          OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
       } finally {
          if (chStmt != null) {
@@ -73,7 +73,7 @@ public class OseeInfoDbItem extends DbItem {
             query = "INSERT INTO " + getTableName() + " (OSEE_KEY, OSEE_VALUE) VALUES (?, ?)";
             ConnectionHandler.runPreparedUpdate(query, key, value);
          }
-      } catch (OseeDataStoreException ex) {
+      } catch (OseeCoreException ex) {
          OseeLog.log(AdminPlugin.class, OseeLevel.SEVERE_POPUP, ex);
       }
    }
diff --git a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java
index 1c9e69cc5cc..39fe43babeb 100644
--- a/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java
+++ b/plugins/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/dbtabletab/SiteGssflRpcr.java
@@ -11,6 +11,7 @@
 package org.eclipse.osee.framework.ui.admin.dbtabletab;
 
 import java.util.logging.Level;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;
 import org.eclipse.osee.framework.database.core.ConnectionHandler;
 import org.eclipse.osee.framework.logging.OseeLog;
@@ -44,7 +45,7 @@ public class SiteGssflRpcr extends DbItem {
       return 100;
    }
 
-   public boolean exists(String program) {
+   public boolean exists(String program) throws OseeCoreException {
       try {
          return ConnectionHandler.runPreparedQueryFetchInt(0,
             "SELECT count(1) FROM " + getTableName() + " WHERE PROGRAM = ?", returnTic(program)) > 0;
@@ -68,7 +69,7 @@ public class SiteGssflRpcr extends DbItem {
             query = "INSERT INTO " + getTableName() + " (program,directory,program_id) VALUES (?,?,?)";
             ConnectionHandler.runPreparedUpdate(query, program, dir, programId);
          }
-      } catch (OseeDataStoreException ex) {
+      } catch (OseeCoreException ex) {
          OseeLog.log(AdminPlugin.class, Level.SEVERE, ex);
       }
    }