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 a60ab0b..864f9a7 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/handlers/InstrumentationHandler.java
@@ -109,18 +109,19 @@
 				break;
 			case IClasspathEntry.CPE_LIBRARY:
 				// �Ώ�Java�v���W�F�N�g�ɎQ�Ƃ���Ă��郉�C�u����
-				if (entry.getPath().getDevice() != null) {
-					// ���Ԃ�AJRE�V�X�e�����C�u����
-					System.out.println(entry.getPath().toString());
-					cp.appendClassPath(entry.getPath().toString());								
-				} else {
-					URI path = fsm.locationURIFor(workspace.getRoot().getFolder(entry.getPath()));
-					System.out.println(path.getPath());
-					try {
-						cp.appendClassPath(path.getPath().substring(1));
-					} catch (NotFoundException e) {
-						e.printStackTrace();
+				try {
+					if (entry.getPath().getDevice() != null) {
+						// ���Ԃ�AJRE�V�X�e�����C�u����
+						System.out.println(entry.getPath().toString());
+						cp.appendClassPath(entry.getPath().toString());								
+					} else {
+						URI path = fsm.locationURIFor(workspace.getRoot().getFolder(entry.getPath()));
+						System.out.println(path.getPath());
+							cp.appendClassPath(path.getPath().substring(1));
 					}
+				} catch (NotFoundException e) {
+					// ���X�A���炩�̗��R�Ń��C�u�����̃p�X�����‚���Ȃ�
+					e.printStackTrace();
 				}
 				break;
 			case IClasspathEntry.CPE_PROJECT:
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 b395b11..51547da 100644
--- a/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
+++ b/org.ntlab.traceCollector/src/org/ntlab/traceCollector/tracer/Tracer.java
@@ -39,10 +39,13 @@
 	public static final String TRACER = "org.ntlab.traceCollector.tracer.";
 	public static final String TRACER_CLASS_PATH = "org/ntlab/traceCollector/tracer/Tracer.class";
 	public static final String JAVASSIST_LIBRARY = "javassist.jar";
-	private static final String STANDARD_CLASSES = "java.util.ListIterator|java.util.Iterator|java.util.List|java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.Map|java.util.HashMap|java.util.Set|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
-	private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
+	private static final String STANDARD_CLASSES = "java.util.ListIterator|java.util.Iterator|java.util.List|java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.Map|java.util.HashMap|java.util.Set|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread|java.awt.Component|java.awt.Container|javax.swing.AbstractButton|javax.swing.ActionMap";
+	private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread|java.awt.Container|java.awt.Panel|java.awt.ScrollPane|java.awt.Window|java.awt.Dialog|java.awt.Frame|javax.swing.JFrame|javax.swing.JPanel|javax.swing.JScrollPane|javax.swing.JTabbedPane|javax.swing.JToolBar|javax.swing.JMenuBar|javax.swing.JButton|javax.swing.JMenuItem|javax.swing.JMenu|javax.swing.JToggleButton|javax.swing.ActionMap";
+//	private static final String STANDARD_CLASSES = "java.util.ListIterator|java.util.Iterator|java.util.List|java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.Map|java.util.HashMap|java.util.Set|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
+//	private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread";
 	private static final String EXCEPT_FOR_METHODS = "java.lang.Thread.currentThread..|java.lang.Thread.getId..";
 	private static final String STANDARD_LIB = "java.";
+	private static final String STANDARD_LIB2 = "javax.";
 	private static OutputStatementsGenerator outputStatementsGenerator = null;
 	private static ClassPool cp = null;
 	private static CodeConverter conv = null;
@@ -254,7 +257,7 @@
 				try {
 					CtMethod m = c.getMethod();
 					String className = m.getDeclaringClass().getName();
-					if (!className.startsWith(STANDARD_LIB) && !className.startsWith(TRACER)) {
+					if (!className.startsWith(STANDARD_LIB) && !className.startsWith(STANDARD_LIB2) && !className.startsWith(TRACER)) {
 						// �ʏ�̃��\�b�h�̌Ăяo��
 						c.replace(outputStatementsGenerator.generateReplaceStatementsForCall(m.getDeclaringClass(), m, c.getLineNumber(), true));
 					} else if (className.matches(STANDARD_CLASSES) && !m.getLongName().matches(EXCEPT_FOR_METHODS)) {
@@ -269,7 +272,7 @@
 				try {
 					CtConstructor m = n.getConstructor();
 					String className = m.getDeclaringClass().getName();
-					if (!className.startsWith(STANDARD_LIB) && !className.startsWith(TRACER)) {
+					if (!className.startsWith(STANDARD_LIB) && !className.startsWith(STANDARD_LIB2) && !className.startsWith(TRACER)) {
 						// �ʏ�̃R���X�g���N�^�̌Ăяo��
 						n.replace(outputStatementsGenerator.generateReplaceStatementsForCall(m.getDeclaringClass(), m, n.getLineNumber(), true));
 					} else if (m.getDeclaringClass().getName().matches(CONCRETE_STANDARD_CLASSES)) {