# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/samuel/Documents/Java/NetBeans/main-golden/java.hints/src
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: org/netbeans/modules/java/hints/Bundle.properties
--- org/netbeans/modules/java/hints/Bundle.properties Base (BASE)
+++ org/netbeans/modules/java/hints/Bundle.properties Locally Modified (Based On LOCAL)
@@ -75,6 +75,7 @@
LBL_Imports_DEFAULT_PACKAGE=Import From java.lang Package
LBL_Imports_FORBIDDEN=Import From Forbidden Package
LBL_Imports_STAR=Star import
+LBL_Imports_EXCLUDED=Import from Excluded
DSC_Imports_DELAGATE=Delegate - non GUI
DSC_Imports_UNUSED=Unused Import
@@ -83,6 +84,7 @@
DSC_Imports_DEFAULT_PACKAGE=Import From java.lang Package
DSC_Imports_FORBIDDEN=Import From Forbidden Package
DSC_Imports_STAR=Star import
+DSC_Imports_EXCLUDED=Import from package or class which has been labelled "Excluded" in the Code Completer
LBL_Imports_Fix_One_SAME_PACKAGE=Remove import from same package
LBL_Imports_Fix_All_SAME_PACKAGE=Remove all imports from same package
Index: org/netbeans/modules/java/hints/Imports.java
--- org/netbeans/modules/java/hints/Imports.java Base (BASE)
+++ org/netbeans/modules/java/hints/Imports.java Locally Modified (Based On LOCAL)
@@ -52,6 +52,7 @@
import org.netbeans.api.java.source.TreeMaker;
import org.netbeans.api.java.source.TreePathHandle;
import org.netbeans.api.java.source.WorkingCopy;
+import org.netbeans.modules.editor.java.Utilities;
import org.netbeans.modules.java.editor.semantic.RemoveUnusedImportFix;
import org.netbeans.modules.java.hints.spi.AbstractHint;
import org.netbeans.spi.editor.hints.ChangeInfo;
@@ -77,6 +78,7 @@
private Imports duplicate;
private Imports defaultPackage;
private Imports samePackage;
+ private Imports excludedPackage;
private Imports forbiddenPackage;
private Imports unused;
private Imports star;
@@ -109,6 +111,12 @@
return d.defaultPackage;
}
+ public static Imports createExcluded() {
+ Imports d = getDelegate();
+ d.excludedPackage = new Imports( ImportHintKind.EXCLUDED );
+ return d.excludedPackage;
+ }
+
public static Imports createForbidden() {
Imports d = getDelegate();
d.forbiddenPackage = new Imports( ImportHintKind.FORBIDDEN );
@@ -239,6 +247,24 @@
}
break;
+ case EXCLUDED:
+ Imports excludePackage = getDelegate().excludedPackage;
+ String pkg = ms.getExpression().toString();
+ String klass = ms.getIdentifier().toString();
+ String exp = pkg + "." + (!klass.equals("*") ? klass : ""); //NOI18N
+ if (excludePackage != null &&
+ excludePackage.isEnabled() &&
+ Utilities.isExcluded(exp)) {
+ result.add(ErrorDescriptionFactory.createErrorDescription(
+ excludePackage.getSeverity().toEditorSeverity(),
+ excludePackage.getDisplayName(),
+ NO_FIXES,
+ ci.getFileObject(),
+ (int) ci.getTrees().getSourcePositions().getStartPosition(ci.getCompilationUnit(), it),
+ (int) ci.getTrees().getSourcePositions().getEndPosition(ci.getCompilationUnit(), it)));
+ }
+
+ break;
default:
return null;
}
@@ -400,13 +426,15 @@
SAME_PACKAGE,
DEFAULT_PACKAGE,
FORBIDDEN,
- STAR;
+ STAR,
+ EXCLUDED;
boolean defaultOn() {
switch( this ) {
case DELEGATE:
case FORBIDDEN:
+ case EXCLUDED:
case SAME_PACKAGE:
case DEFAULT_PACKAGE:
case UNUSED:
Index: org/netbeans/modules/java/hints/resources/layer.xml
--- org/netbeans/modules/java/hints/resources/layer.xml Base (BASE)
+++ org/netbeans/modules/java/hints/resources/layer.xml Locally Modified (Based On LOCAL)
@@ -174,6 +174,9 @@
+
+
+