Fix eclipse warnings

* Remove unnecessary import statements * Ensure file and buffered readers have been closed * Remove unnecessary semi colons * Fix warnings in switch statements
Teiid-Designer · Jul 19, 2012 · fa46599 · fa46599
1 parent f5d613b
commit fa46599
Show file tree

Hide file tree

Showing 71 changed files with 80 additions and 133 deletions.
diff --git a/plugins/org.mockito/build.properties b/plugins/org.mockito/build.properties
@@ -4,6 +4,4 @@ bin.includes = plugin.properties,\
                NOTICE,\
                com.springsource.org.objenesis-1.0.0.jar,\
                mockito-core-1.9.0.jar
-output.. = bin/
-source.. = src/
 src.includes = *
diff --git a/...d.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java b/...d.designer.advisor.ui/src/org/teiid/designer/advisor/ui/actions/AdvisorActionFactory.java
@@ -550,7 +550,7 @@ public static void executeAction(String id, Properties properties, boolean synch
 	        return;
 		}
 
-		if( id.equalsIgnoreCase(COMMAND_IDS.NEW_TEIID_MODEL_PROJECT)) {;
+		if( id.equalsIgnoreCase(COMMAND_IDS.NEW_TEIID_MODEL_PROJECT)) {
 			ModelerUiViewUtils.launchWizard("newModelProject", new StructuredSelection(), properties, synchronous); //$NON-NLS-1$
 	        return;
 		}

diff --git a/...esigner.advisor.ui/src/org/teiid/designer/advisor/ui/views/status/ProjectStatusPanel.java b/...esigner.advisor.ui/src/org/teiid/designer/advisor/ui/views/status/ProjectStatusPanel.java
@@ -8,7 +8,6 @@
 package org.teiid.designer.advisor.ui.views.status;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.swt.SWT;

diff --git a/...designer.core/src/org/teiid/designer/core/extension/EmfModelObjectExtensionAssistant.java b/...designer.core/src/org/teiid/designer/core/extension/EmfModelObjectExtensionAssistant.java
@@ -17,7 +17,6 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.EMap;

diff --git a/plugins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/DotProjectUtils.java b/plugins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/DotProjectUtils.java
@@ -19,7 +19,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectNature;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.jdom.Document;

diff --git a/...ins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceImpl.java b/...ins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceImpl.java
@@ -12,6 +12,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -20,7 +21,6 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;

diff --git a/...ins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceInfo.java b/...ins/org.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceInfo.java
@@ -8,7 +8,6 @@
 package org.teiid.designer.core.workspace;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.teiid.designer.core.ModelerCore;
 
 /**

diff --git a/...g.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceSelections.java b/...g.teiid.designer.core/src/org/teiid/designer/core/workspace/ModelWorkspaceSelections.java
@@ -14,8 +14,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.teiid.core.selection.TreeSelection;
 import org.teiid.core.util.CoreArgCheck;

diff --git a/...eiid.designer.core/src/org/teiid/designer/core/workspace/WorkspaceResourceFinderUtil.java b/...eiid.designer.core/src/org/teiid/designer/core/workspace/WorkspaceResourceFinderUtil.java
@@ -20,7 +20,6 @@
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;

diff --git a/...gram.ui/src/org/teiid/designer/diagram/ui/custom/actions/AddToNewCustomDiagramAction.java b/...gram.ui/src/org/teiid/designer/diagram/ui/custom/actions/AddToNewCustomDiagramAction.java
@@ -11,6 +11,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -379,7 +380,7 @@ private List getAssociatedObjectsNotInDiagram( DiagramEditor editor,
             EObject nextEObj = null;
             while (iter.hasNext()) {
                 nextEObj = (EObject)iter.next();
-                if (editor != null && editor.getCurrentModel() != null) {
+                if (editor.getCurrentModel() != null) {
                     if (!(DiagramUiUtilities.diagramContainsEObject(nextEObj, diagramNode))) newObjects.add(nextEObj);
                 }
             }

diff --git a/...org.teiid.designer.diagram.ui/src/org/teiid/designer/diagram/ui/editor/DiagramEditor.java b/...org.teiid.designer.diagram.ui/src/org/teiid/designer/diagram/ui/editor/DiagramEditor.java
@@ -21,7 +21,6 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;

diff --git a/...rg.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/preview/PreviewDataDialog.java b/...rg.teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/preview/PreviewDataDialog.java
@@ -8,7 +8,7 @@
 package org.teiid.designer.runtime.ui.preview;
 
 import java.util.Properties;
-import org.eclipse.core.resources.ResourcesPlugin;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;

diff --git a/....teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidViewTreeProvider.java b/....teiid.designer.dqp.ui/src/org/teiid/designer/runtime/ui/views/TeiidViewTreeProvider.java
@@ -18,7 +18,6 @@
 import net.jcip.annotations.GuardedBy;
 
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
@@ -150,24 +149,13 @@ public void decorate( Object element,
         // the getElements method
         if (getServerManager() != null) {
             assert (element instanceof Server) : "element is not a server (check plugin.xml enablement)"; //$NON-NLS-1$
-            ImageDescriptor overlay = null;
             Server server = (Server)element;
 
             if (isOkToConnect(server)) {
                 // decorate server if can't connect
                 if (!server.isConnected()) {
                     addOfflineServer(server);
-                    //ISharedImages images = DqpUiPlugin.getDefault().getWorkbench().getSharedImages();
-                    //overlay = images.getImageDescriptor(ISharedImages.IMG_DEC_FIELD_ERROR);
                 }
-            } else {
-            	if( server.isConnected() ) {
-            		overlay = null;
-            	}
-            }
-
-            if (overlay != null) {
-                decoration.addOverlay(overlay);
             }
         }
     }

diff --git a/plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/PreviewManager.java b/plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/PreviewManager.java
@@ -38,7 +38,6 @@
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -77,11 +76,11 @@
 import org.teiid.designer.metamodels.relational.RelationalPackage;
 import org.teiid.designer.metamodels.webservice.WebServicePackage;
 import org.teiid.designer.metamodels.xml.XmlDocumentPackage;
+import org.teiid.designer.runtime.DqpPlugin;
 import org.teiid.designer.runtime.ExecutionAdmin;
 import org.teiid.designer.runtime.ExecutionConfigurationEvent;
 import org.teiid.designer.runtime.ExecutionConfigurationEvent.EventType;
 import org.teiid.designer.runtime.ExecutionConfigurationEvent.TargetType;
-import org.teiid.designer.runtime.DqpPlugin;
 import org.teiid.designer.runtime.IExecutionConfigurationListener;
 import org.teiid.designer.runtime.PreferenceConstants;
 import org.teiid.designer.runtime.Server;

diff --git a/...teiid.designer.extension.ui/src/org/teiid/designer/extension/ui/wizards/NewMedWizard.java b/...teiid.designer.extension.ui/src/org/teiid/designer/extension/ui/wizards/NewMedWizard.java
@@ -15,7 +15,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

diff --git a/....teiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcImportOptionsPage.java b/....teiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcImportOptionsPage.java
@@ -18,7 +18,6 @@
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;

diff --git a/...s/org.teiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcImportWizard.java b/...s/org.teiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcImportWizard.java
@@ -15,11 +15,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;

diff --git a/...eiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcSourceSelectionPage.java b/...eiid.designer.jdbc.ui/src/org/teiid/designer/jdbc/ui/wizards/JdbcSourceSelectionPage.java
@@ -14,7 +14,6 @@
 import java.util.Map;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.datatools.connectivity.IConnectionProfile;

diff --git a/...d.designer.metamodels.xsd/src/org/teiid/designer/metamodels/xsd/XsdSchemaBuilderImpl.java b/...d.designer.metamodels.xsd/src/org/teiid/designer/metamodels/xsd/XsdSchemaBuilderImpl.java
@@ -19,7 +19,6 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

diff --git a/...ce.ui/src/org/teiid/designer/modelgenerator/salesforce/ui/wizards/ModelSelectionPage.java b/...ce.ui/src/org/teiid/designer/modelgenerator/salesforce/ui/wizards/ModelSelectionPage.java
@@ -15,7 +15,6 @@
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;

diff --git a/...nerator.wsdl.ui/src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/SelectWsdlPage.java b/...nerator.wsdl.ui/src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/SelectWsdlPage.java
@@ -16,7 +16,6 @@
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;

diff --git a/...i/src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/soap/ImportWsdlSchemaHandler.java b/...i/src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/soap/ImportWsdlSchemaHandler.java
@@ -11,7 +11,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -884,8 +883,6 @@ private SchemaNode getParentElement(SchemaNode node) {
 	}
 
 	private void getRelativeXpath(SchemaNode node, StringBuilder xpath, SchemaTreeModel schemaTreeModel) {
-		Object element = node.getElement();
-		Map<String, String> nsMap = this.operationsDetailsPage.getProcedureGenerator().getResponseInfo().getNamespaceMap();
 		String relativeXpath = node == null ? "" : node.getRelativeXpath(); //$NON-NLS-1$
 		//We need to append the full path and then remove the root path.
 		//This allows us to resolve nested complex types

diff --git a/...i/src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/soap/panels/EditColumnsPanel.java b/...i/src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/soap/panels/EditColumnsPanel.java
@@ -193,27 +193,19 @@ public String getText(Object element) {
 			if (element instanceof ColumnInfo) {
 				switch(this.columnNumber) {
 					case 0: {
-						if(element instanceof ColumnInfo) {
-							return ((ColumnInfo)element).getName();
-						}
+						return ((ColumnInfo)element).getName();
 					}
 					case 1: {
 						return EMPTY;
 					}
 					case 2: {
-						if(element instanceof ColumnInfo) {
-							return ((ColumnInfo)element).getDatatype();
-						}
+						return ((ColumnInfo)element).getDatatype();
 					}
 					case 3: {
-						if(element instanceof ColumnInfo) {
-							return ((ColumnInfo)element).getDefaultValue();
-						}
+						return ((ColumnInfo)element).getDefaultValue();
 					}
 					case 4: {
-						if(element instanceof ColumnInfo) {
-							return ((ColumnInfo)element).getRelativePath();
-						}
+						return ((ColumnInfo)element).getRelativePath();
 					}
 				}
 			}

diff --git a/...src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/soap/panels/ImportOptionsPanel.java b/...src/org/teiid/designer/modelgenerator/wsdl/ui/wizards/soap/panels/ImportOptionsPanel.java
@@ -151,7 +151,7 @@ public void widgetSelected(SelectionEvent e) {
     			sourceModelHelpText.setLayoutData(gd);
     		}
 
-		};
+		}
 
 		VIEW_MODEL_INFO : {
 			Group group = WidgetFactory.createGroup(parent, Messages.ViewModelDefinition, GridData.FILL_HORIZONTAL, 1);
@@ -218,7 +218,7 @@ public void widgetSelected(SelectionEvent e) {
         		helpGroup.setLayout(new GridLayout(1, false));
         		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
         		gd.horizontalSpan = 3;
-        		helpGroup.setLayoutData(gd);;
+        		helpGroup.setLayoutData(gd);
 
 
     			viewModelHelpText = new Text(helpGroup, SWT.WRAP | SWT.READ_ONLY);

diff --git a/...enerator.xml/src/org/teiid/designer/modelgenerator/xml/wizards/JdbcImportOptionsPage.java b/...enerator.xml/src/org/teiid/designer/modelgenerator/xml/wizards/JdbcImportOptionsPage.java
@@ -8,12 +8,12 @@
 package org.teiid.designer.modelgenerator.xml.wizards;
 
 import java.sql.DatabaseMetaData;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.dialogs.IDialogSettings;

diff --git a/...or.xml/src/org/teiid/designer/modelgenerator/xml/wizards/XsdAsRelationalImportWizard.java b/...or.xml/src/org/teiid/designer/modelgenerator/xml/wizards/XsdAsRelationalImportWizard.java
@@ -15,7 +15,6 @@
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

diff --git a/...r.relational.ui/src/org/teiid/designer/relational/ui/edit/RelationalTableEditorPanel.java b/...r.relational.ui/src/org/teiid/designer/relational/ui/edit/RelationalTableEditorPanel.java
@@ -1182,19 +1182,13 @@ public String getText(Object element) {
 			if( element instanceof RelationalColumn ) {
 				switch (this.columnNumber) {
 					case 0: {
-						if(element instanceof RelationalColumn) {
-							return ((RelationalColumn)element).getName();
-						}
+						return ((RelationalColumn)element).getName();
 					}
 					case 1: {
-						if(element instanceof RelationalColumn) {
-							return ((RelationalColumn)element).getDatatype();
-						}
+						return ((RelationalColumn)element).getDatatype();
 					}
 					case 2: {
-						if(element instanceof RelationalColumn) {
-							return Integer.toString(((RelationalColumn)element).getLength());
-						}
+						return Integer.toString(((RelationalColumn)element).getLength());
 					}
 				}
 			}
@@ -1985,7 +1979,7 @@ public void widgetSelected(SelectionEvent e) {
     						}
 		        			String tblName = EMPTY_STRING;
 		        			String keyName = EMPTY_STRING;
-		        			boolean foundCheckedItem = false;;
+		        			boolean foundCheckedItem = false;
     						for( TableItem item : keyViewer.getTable().getItems()) {
 	    		        		if( item.getChecked() ) {
 	    		        			foundCheckedItem = true;

diff --git a/...relational.ui/src/org/teiid/designer/relational/ui/wizards/RelationalObjectProcessor.java b/...relational.ui/src/org/teiid/designer/relational/ui/wizards/RelationalObjectProcessor.java
@@ -12,10 +12,10 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;

diff --git a/plugins/org.teiid.designer.roles.ui/src/org/teiid/designer/roles/ui/PermissionHandler.java b/plugins/org.teiid.designer.roles.ui/src/org/teiid/designer/roles/ui/PermissionHandler.java
@@ -10,6 +10,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
@@ -472,6 +473,8 @@ public boolean supportsUpdates( Object element,
 	                	case READ: return true;
 	                	case UPDATE: return TransformationHelper.isUpdateAllowed(transMappingRoot);
 	                	case DELETE: return TransformationHelper.isDeleteAllowed(transMappingRoot);
+	                	default:
+	                		return false;
                     }
                 } else {
                     return tableAspect.supportsUpdate((EObject)targetObj);

diff --git a/...import.ui/src/org/teiid/designer/tools/textimport/ui/wizards/AbstractObjectProcessor.java b/...import.ui/src/org/teiid/designer/tools/textimport/ui/wizards/AbstractObjectProcessor.java
@@ -11,11 +11,11 @@
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.Collection;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;