Remove calls to teiid exception classes

* No need to keep calls to these exceptions since catch statements can use Exception instead
Teiid-Designer · Dec 7, 2012 · 80edc1b · 80edc1b
1 parent d007200
commit 80edc1b
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/...ns/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/RuntimeAction.java b/...ns/org.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/actions/RuntimeAction.java
@@ -8,14 +8,11 @@
 package org.teiid.designer.runtime.ui.actions;
 
 import static org.teiid.designer.runtime.ui.DqpUiConstants.UTIL;
-
 import java.util.List;
-
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.teiid.adminapi.AdminComponentException;
 import org.teiid.designer.runtime.ExecutionAdmin;
 import org.teiid.designer.runtime.TeiidServer;
 import org.teiid.designer.runtime.TeiidTranslator;
@@ -81,9 +78,6 @@ public void selectionChanged( SelectionChangedEvent theEvent ) {
                 } else if (obj instanceof TeiidServer) {
                     try {
                         tempAdmin = ((TeiidServer)obj).getAdmin();
-                    } catch (AdminComponentException ace) {
-                        newAdmin = null;
-                        break;
                     } catch (Exception e) {
                         UTIL.log(e);
                         newAdmin = null;

diff --git a/plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionAdmin.java b/plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionAdmin.java
@@ -29,7 +29,6 @@
 import org.eclipse.datatools.connectivity.ProfileManager;
 import org.eclipse.osgi.util.NLS;
 import org.teiid.adminapi.Admin;
-import org.teiid.adminapi.AdminException;
 import org.teiid.adminapi.PropertyDefinition;
 import org.teiid.adminapi.Translator;
 import org.teiid.adminapi.VDB;
@@ -424,7 +423,7 @@ private void deployJars(Admin admin, String jarList) {
                     }
                     try {
                         admin.deploy(fileName, iStream);
-                    } catch (AdminException ex) {
+                    } catch (Exception ex) {
                         // Jar deployment failed
                         Util.log(IStatus.ERROR, ex, NLS.bind(Messages.JarDeploymentFailed, theFile.getPath()));
                     }

diff --git a/plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServer.java b/plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServer.java
@@ -17,7 +17,6 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.wst.server.core.IServer;
 import org.teiid.adminapi.Admin;
-import org.teiid.adminapi.AdminException;
 import org.teiid.adminapi.AdminFactory;
 import org.teiid.core.designer.util.CoreArgCheck;
 import org.teiid.designer.core.util.StringUtilities;
@@ -454,9 +453,6 @@ public IStatus testJDBCPing(String host, String port, String username, String pa
 		        adminApi.close();
 		        this.admin = null;
 			}
-		} catch (AdminException ex) {
-			String msg = Util.getString("serverDeployUndeployProblemPingingTeiidJdbc", url); //$NON-NLS-1$
-            return new Status(IStatus.ERROR, PLUGIN_ID, msg, ex);
 		} catch (Exception ex) {
 			String msg = Util.getString("serverDeployUndeployProblemPingingTeiidJdbc", url); //$NON-NLS-1$
             return new Status(IStatus.ERROR, PLUGIN_ID, msg, ex);

diff --git a/...transformation/src/org/teiid/designer/transformation/metadata/TransformationMetadata.java b/...transformation/src/org/teiid/designer/transformation/metadata/TransformationMetadata.java
@@ -20,15 +20,13 @@
 import java.util.List;
 import java.util.Properties;
 import org.teiid.api.exception.query.QueryMetadataException;
-import org.teiid.core.TeiidComponentException;
 import org.teiid.core.designer.TeiidDesignerException;
 import org.teiid.core.designer.TeiidDesignerRuntimeException;
 import org.teiid.core.designer.id.UUID;
 import org.teiid.core.designer.util.CoreArgCheck;
 import org.teiid.core.designer.util.CoreStringUtil;
 import org.teiid.core.designer.util.ModelType;
 import org.teiid.core.types.DataTypeManager;
-
 import org.teiid.designer.core.index.CompositeIndexSelector;
 import org.teiid.designer.core.index.IEntryResult;
 import org.teiid.designer.core.index.Index;