diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java
index 0a91b41..8ac9832 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/TracerLaunchConfigurationDelegate.java
@@ -8,7 +8,6 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.debug.core.ILaunch;
@@ -62,7 +61,7 @@
 			ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
 			
 			// VM-specific attributes
-			Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
+			Map<String, Object> vmAttributesMap = getVMSpecificAttributesMap(configuration);
 			
 			// Classpath
 			String[] configClasspath = getClasspath(configuration);
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
index a79d04c..464508c 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
@@ -36,6 +36,7 @@
  * @author Nitta
  *
  */
+@SuppressWarnings("restriction")
 public abstract class InstrumentationHandler extends AbstractHandler {
 
 	@Override
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
index 2e5d979..268f7a5 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
@@ -182,7 +182,7 @@
 		if (m instanceof CtMethod && !m.isEmpty()) {
 			ControlFlow cf = new ControlFlow((CtMethod)m);
 			blocks = cf.basicBlocks();
-			List list = m.getMethodInfo().getCodeAttribute().getAttributes();
+			List<?> list = m.getMethodInfo().getCodeAttribute().getAttributes();
 			LineNumberAttribute attr = null;
 			for (int i = 0; i < list.size(); i++) {
 				if (list.get(i) instanceof LineNumberAttribute){
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java
index fb0f897..82e619a 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/TracerClassLoader.java
@@ -31,7 +31,7 @@
 
 			// �����̃N���X���[�_�[���w�肵��JavaVM�̃N���X�ɕϊ�
 			ProtectionDomain pd = this.getClass().getProtectionDomain();
-			Class c = cc.toClass(this, pd);
+			Class<?> c = cc.toClass(this, pd);
 
 			if (resolve) {
 				resolveClass(c);
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerLaunchShortcut.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerLaunchShortcut.java
index 182c1ef..da9eb34 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerLaunchShortcut.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerLaunchShortcut.java
@@ -25,8 +25,6 @@
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorPart;
 
 public class TracerLaunchShortcut extends org.eclipse.jdt.debug.ui.launchConfigurations.JavaLaunchShortcut {
 	
@@ -44,7 +42,7 @@
 	 * @since 3.5
 	 */
 	protected IJavaElement[] getJavaElements(Object[] objects) {
-		List list= new ArrayList(objects.length);
+		List<IJavaElement> list = new ArrayList<>(objects.length);
 		for (int i = 0; i < objects.length; i++) {
 			Object object = objects[i];
 			if (object instanceof IAdaptable) {
@@ -52,9 +50,9 @@
 				if (element != null) {
 					if (element instanceof IMember) {
 						// Use the declaring type if available
-						IJavaElement type= ((IMember)element).getDeclaringType();
+						IJavaElement type = ((IMember)element).getDeclaringType();
 						if (type != null) {
-							element= type;
+							element = type;
 						}
 					}
 					list.add(element);
diff --git a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerTab.java b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerTab.java
index b17f0f3..368875c 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerTab.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/ui/TracerTab.java
@@ -1,41 +1,11 @@
 package org.ntlab.traceCollector.ui;
 
-import java.lang.reflect.InvocationTargetException;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.internal.ui.SWTFactory;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants;
-import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds;
-import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin;
-import org.eclipse.jdt.internal.debug.ui.launcher.DebugTypeSelectionDialog;
-import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages;
-import org.eclipse.jdt.internal.debug.ui.launcher.MainMethodSearchEngine;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
 
 
 public class TracerTab extends org.eclipse.debug.ui.AbstractLaunchConfigurationTab {
@@ -51,10 +21,6 @@
 		
 	}
 	
-	private Group createGroup(Composite parent, String title) {
-		return SWTFactory.createGroup(parent, title, 2, 1, GridData.FILL_HORIZONTAL);
-	}
-
 	@Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 		// TODO Auto-generated method stub