From 20dee9d5231909bb7027051784cd392e21422e04 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 25 Sep 2019 20:01:17 +0200 Subject: [PATCH 1/4] fix: fix regression after auto-import found in NpeFix --- src/main/java/spoon/reflect/visitor/ImportAnalyzer.java | 3 --- src/main/java/spoon/reflect/visitor/ImportCleaner.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java b/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java index 31b6659158f..cb85fa48820 100644 --- a/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java +++ b/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java @@ -135,9 +135,6 @@ public ScanningMode enter(CtRole role, CtElement element) { if (!((CtTypeReference) parent).getAccessType().equals(element)) { return ScanningMode.SKIP_ALL; } - } else { - //May be this can never happen - throw new SpoonException("Check this case. Is it relevant or not?"); } } if (role == CtRole.TYPE && element instanceof CtTypeReference) { diff --git a/src/main/java/spoon/reflect/visitor/ImportCleaner.java b/src/main/java/spoon/reflect/visitor/ImportCleaner.java index 9221f31745e..3a8d1ddc312 100644 --- a/src/main/java/spoon/reflect/visitor/ImportCleaner.java +++ b/src/main/java/spoon/reflect/visitor/ImportCleaner.java @@ -169,7 +169,7 @@ void addImport(CtReference ref) { } CtPackageReference packageRef = topLevelTypeRef.getPackage(); if (packageRef == null) { - throw new SpoonException("Type reference has no package"); + return; } if ("java.lang".equals(packageRef.getQualifiedName())) { //java.lang is always imported implicitly. Ignore it From 91be008a97351691efa4ee8ea8437effa60a4612 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 25 Sep 2019 20:26:34 +0200 Subject: [PATCH 2/4] =?UTF-8?q?@monperrus=20at=20work=20=F0=9F=88=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/spoon/reflect/visitor/ImportAnalyzer.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java b/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java index cb85fa48820..ed80babe918 100644 --- a/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java +++ b/src/main/java/spoon/reflect/visitor/ImportAnalyzer.java @@ -5,7 +5,6 @@ */ package spoon.reflect.visitor; -import spoon.SpoonException; import spoon.processing.AbstractProcessor; import spoon.processing.Processor; import spoon.reflect.code.CtConstructorCall; From 37a1c33cc6a1ffee8ef07fc495f6ca83b46da5f8 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 25 Sep 2019 20:27:36 +0200 Subject: [PATCH 3/4] =?UTF-8?q?@monperrus=20at=20work=20=F0=9F=92=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From eca93a535afbbb627ba945ef8c02fe5a73320aa0 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 25 Sep 2019 20:28:37 +0200 Subject: [PATCH 4/4] =?UTF-8?q?@monperrus=20at=20work=20=F0=9F=A4=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit