final
.
.
Merge branch 'master' of https://github.com/taobinxian/ConRef

Conflicts:
	ConRef/bin/com/conref/refactoring/convertSyncFieldToLock/actions/convertSyncFieldToLock$1.class
	ConRef/bin/com/conref/refactoring/convertSyncFieldToLock/actions/convertSyncFieldToLock$2$1.class
	ConRef/bin/com/conref/refactoring/convertSyncFieldToLock/actions/convertSyncFieldToLock$2.class
	ConRef/bin/com/conref/refactoring/convertSyncFieldToLock/actions/convertSyncFieldToLock.class
	ConRef/bin/com/conref/refactoring/convertSyncFieldToLock/refactoring/convertSyncFieldToLockRefactoring.class
	ConRef/bin/com/conref/refactoring/convertSyncFieldToLock/refactoringWizard/convertSyncFieldToLockWizard.class
	ConRef/bin/com/conref/refactoring/makeClassThreadSafe/actions/makeClassThreadSafe.class
	ConRef/bin/com/conref/refactoring/makeClassThreadSafe/refactor/makeClassThreadSafeRefactoring.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic$1$1.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic$1.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic$SimpleNameVisitor$1.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic$SimpleNameVisitor$2.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic$SimpleNameVisitor.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/refactor/makeAtomicRefactoring.class
	ConRef/bin/com/conref/refactoring/makeFieldAtomic/refactoringWizard/makeAtomicRefactoringWizard.class
	ConRef/bin/com/conref/refactoring/makeFieldThreadLocal/actions/makeFieldThreadLocal$1$1.class
	ConRef/bin/com/conref/refactoring/makeFieldThreadLocal/actions/makeFieldThreadLocal$1$2.class
	ConRef/bin/com/conref/refactoring/makeFieldThreadLocal/actions/makeFieldThreadLocal$1.class
	ConRef/bin/com/conref/refactoring/makeFieldThreadLocal/actions/makeFieldThreadLocal.class
	ConRef/bin/com/conref/refactoring/makeFieldThreadLocal/refactor/makeFieldThreadLocalRefactoring.class
	ConRef/bin/com/conref/refactoring/splitlock/actions/splitlock.class
	ConRef/bin/com/conref/refactoring/splitlock/core/manualSplitSettingsDlg$1$1.class
	ConRef/bin/com/conref/refactoring/splitlock/core/manualSplitSettingsDlg$1.class
	ConRef/bin/com/conref/refactoring/splitlock/core/manualSplitSettingsDlg$2.class
	ConRef/bin/com/conref/refactoring/splitlock/core/manualSplitSettingsDlg.class
	ConRef/bin/com/conref/refactoring/splitlock/refactoringWizard/splitRefactoringWizard.class
	ConRef/bin/com/conref/refactoring/splitlock/refactoringWizard/splitlockInputPage$ContentProvider.class
	ConRef/bin/com/conref/refactoring/splitlock/refactoringWizard/splitlockInputPage$TableLabelProvider.class
	ConRef/bin/com/conref/refactoring/splitlock/refactoringWizard/splitlockInputPage.class
	ConRef/bin/com/conref/refactoring/splitlock/views/MethodsView$2.class
	ConRef/plugin.xml
	ConRef/src/com/conref/refactoring/convertSyncFieldToLock/actions/convertSyncFieldToLock.java
	ConRef/src/com/conref/refactoring/convertSyncFieldToLock/refactoring/convertSyncFieldToLockRefactoring.java
	ConRef/src/com/conref/refactoring/convertSyncFieldToLock/refactoringWizard/convertSyncFieldToLockWizard.java
	ConRef/src/com/conref/refactoring/makeClassThreadSafe/actions/makeClassThreadSafe.java
	ConRef/src/com/conref/refactoring/makeClassThreadSafe/refactor/makeClassThreadSafeRefactoring.java
	ConRef/src/com/conref/refactoring/makeClassThreadSafe/refactorWizard/makeClassThreadSafeRefactoringWizard.java
	ConRef/src/com/conref/refactoring/makeFieldAtomic/actions/makeFieldAtomic.java
	ConRef/src/com/conref/refactoring/makeFieldAtomic/refactor/makeAtomicRefactoring.java
	ConRef/src/com/conref/refactoring/makeFieldAtomic/refactoringWizard/makeAtomicRefactoringWizard.java
	ConRef/src/com/conref/refactoring/makeFieldThreadLocal/actions/makeFieldThreadLocal.java
	ConRef/src/com/conref/refactoring/makeFieldThreadLocal/refactor/makeFieldThreadLocalRefactoring.java
	ConRef/src/com/conref/refactoring/makeFieldThreadLocal/refactorWizard/makeFieldThreadLocalRefactoringWizard.java
	ConRef/src/com/conref/refactoring/splitlock/actions/splitlock.java
	ConRef/src/com/conref/refactoring/splitlock/core/manualSplitSettingsDlg.java
	ConRef/src/com/conref/refactoring/splitlock/refactoringWizard/splitRefactoringWizard.java
	ConRef/src/com/conref/refactoring/splitlock/refactoringWizard/splitlockInputPage.java