# HG changeset patch
# Parent 97ec7ced388f5e91b60e2c8bc5cac5de315026a9
# User Jesse Glick <jglick@netbeans.org>
#206954: annotation to register navigator panels.

diff --git a/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java b/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java
new file mode 100644
--- /dev/null
+++ b/apisupport.refactoring/src/org/netbeans/modules/apisupport/hints/NavigatorHinter.java
@@ -0,0 +1,97 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.apisupport.hints;
+
+import com.sun.source.tree.ModifiersTree;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import javax.lang.model.element.Element;
+import org.netbeans.api.java.source.GeneratorUtilities;
+import org.netbeans.api.java.source.WorkingCopy;
+import static org.netbeans.modules.apisupport.hints.Bundle.*;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.filesystems.FileObject;
+import org.openide.util.NbBundle.Messages;
+import org.openide.util.lookup.ServiceProvider;
+
+@ServiceProvider(service=Hinter.class)
+public class NavigatorHinter implements Hinter {
+
+    private static final String PANELS_FOLDER = "Navigator/Panels/";
+    private static final String REGISTRATION_BINARY = "org.netbeans.spi.navigator.NavigatorPanel$Registration";
+
+    @Messages("NavigatorHinter.missing_dep=You must be using org.netbeans.spi.navigator 1.22+ before using this fix.")
+    @Override public void process(final Context ctx) throws Exception {
+        final FileObject file = ctx.file();
+        if (!file.getPath().startsWith(PANELS_FOLDER)) {
+            return;
+        }
+        final Object instanceCreate = ctx.instanceAttribute(file);
+        if (instanceCreate != null) {
+            ctx.addStandardAnnotationHint(new Callable<Void>() {
+                public @Override Void call() throws Exception {
+                    if (!ctx.canAccess(REGISTRATION_BINARY)) {
+                        DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(NavigatorHinter_missing_dep(), NotifyDescriptor.WARNING_MESSAGE));
+                        return null;
+                    }
+                    ctx.findAndModifyDeclaration(instanceCreate, new Context.ModifyDeclarationTask() {
+                        @Override public void run(WorkingCopy wc, Element declaration, ModifiersTree modifiers) throws Exception {
+                            Map<String,Object> params = new LinkedHashMap<String,Object>();
+                            params.put("mimeType", file.getParent().getPath().substring(PANELS_FOLDER.length()));
+                            params.put("position", file.getAttribute("position"));
+                            params.put("displayName", "#TODO");
+                            String canon = REGISTRATION_BINARY.replace('$', '.');
+                            ModifiersTree nue = ctx.addAnnotation(wc, modifiers, canon, canon + "s", params);
+                            ctx.delete(file);
+                            wc.rewrite(modifiers, GeneratorUtilities.get(wc).importFQNs(nue));
+                        }
+                    });
+                    return null;
+                }
+            });
+        }
+    }
+
+}
diff --git a/beans/nbproject/project.xml b/beans/nbproject/project.xml
--- a/beans/nbproject/project.xml
+++ b/beans/nbproject/project.xml
@@ -194,7 +194,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.5</specification-version>
+                        <specification-version>1.22</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/beans/src/org/netbeans/modules/beans/BeanPanel.java b/beans/src/org/netbeans/modules/beans/BeanPanel.java
--- a/beans/src/org/netbeans/modules/beans/BeanPanel.java
+++ b/beans/src/org/netbeans/modules/beans/BeanPanel.java
@@ -30,6 +30,7 @@
  *
  * @author Tomas Zezula
  */
+@NavigatorPanel.Registration(mimeType="text/x-java", position=500, displayName="#LBL_BeanPatterns")
 public class BeanPanel implements NavigatorPanel {
 
     private BeanPanelUI component;
diff --git a/beans/src/org/netbeans/modules/beans/resources/mf-layer.xml b/beans/src/org/netbeans/modules/beans/resources/mf-layer.xml
--- a/beans/src/org/netbeans/modules/beans/resources/mf-layer.xml
+++ b/beans/src/org/netbeans/modules/beans/resources/mf-layer.xml
@@ -56,18 +56,6 @@
             </file>
         </folder>
     </folder>
-  <folder name="Navigator">
-        <folder name="Panels">
-            <folder name="text">
-                <folder name="x-java">
-                    <file name="org-netbeans-modules-beans-BeanPanel.instance">
-                        <attr name="position" intvalue="500"/>
-                    </file>
-                </folder>
-            </folder>
-        </folder>
-    </folder>
-  
 
     <folder name="org.netbeans.modules.java.codestyle">
         <file name="AddProperty.freemarker" url="templates/AddProperty.freemarker">
diff --git a/image/nbproject/project.xml b/image/nbproject/project.xml
--- a/image/nbproject/project.xml
+++ b/image/nbproject/project.xml
@@ -59,6 +59,15 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.netbeans.spi.navigator</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.22</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.actions</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
@@ -138,15 +147,6 @@
                         <specification-version>6.2</specification-version>
                     </run-dependency>
                 </dependency>
-                 <dependency>
-                    <code-name-base>org.netbeans.spi.navigator</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.19</specification-version>
-                    </run-dependency>
-                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>
diff --git a/image/src/org/netbeans/modules/image/Layer.xml b/image/src/org/netbeans/modules/image/Layer.xml
--- a/image/src/org/netbeans/modules/image/Layer.xml
+++ b/image/src/org/netbeans/modules/image/Layer.xml
@@ -161,30 +161,4 @@
         </folder>
     </folder>
     
-    <folder name="Navigator">
-        <folder name="Panels">
-            <folder name="image">
-                <folder name="png">
-                     <file name="org-netbeans-modules-image-navigation-ImageNavigatorPanel.instance">
-                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.image.navigation.Bundle"/>
-                    </file>
-                </folder>
-                <folder name="jpeg">
-                     <file name="org-netbeans-modules-image-navigation-ImageNavigatorPanel.instance">
-                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.image.navigation.Bundle"/>
-                    </file>
-                </folder>
-                <folder name="bmp">
-                     <file name="org-netbeans-modules-image-navigation-ImageNavigatorPanel.instance">
-                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.image.navigation.Bundle"/>
-                    </file>
-                </folder>
-                <folder name="gif">
-                     <file name="org-netbeans-modules-image-navigation-ImageNavigatorPanel.instance">
-                        <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.image.navigation.Bundle"/>
-                    </file>
-                </folder>
-            </folder>
-        </folder>
-    </folder>
 </filesystem>
diff --git a/image/src/org/netbeans/modules/image/navigation/ImageNavigatorPanel.java b/image/src/org/netbeans/modules/image/navigation/ImageNavigatorPanel.java
--- a/image/src/org/netbeans/modules/image/navigation/ImageNavigatorPanel.java
+++ b/image/src/org/netbeans/modules/image/navigation/ImageNavigatorPanel.java
@@ -60,6 +60,12 @@
  *
  * @author jpeska
  */
+@NavigatorPanel.Registrations({
+    @NavigatorPanel.Registration(mimeType="image/png", displayName="#Navigator_DisplayName"),
+    @NavigatorPanel.Registration(mimeType="image/jpeg", displayName="#Navigator_DisplayName"),
+    @NavigatorPanel.Registration(mimeType="image/bmp", displayName="#Navigator_DisplayName"),
+    @NavigatorPanel.Registration(mimeType="image/gif", displayName="#Navigator_DisplayName")
+})
 public class ImageNavigatorPanel implements NavigatorPanel {
 
     /**
diff --git a/java.navigation/nbproject/project.xml b/java.navigation/nbproject/project.xml
--- a/java.navigation/nbproject/project.xml
+++ b/java.navigation/nbproject/project.xml
@@ -205,6 +205,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
+                        <specification-version>1.22</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/java.navigation/src/org/netbeans/modules/java/navigation/ClassMemberPanel.java b/java.navigation/src/org/netbeans/modules/java/navigation/ClassMemberPanel.java
--- a/java.navigation/src/org/netbeans/modules/java/navigation/ClassMemberPanel.java
+++ b/java.navigation/src/org/netbeans/modules/java/navigation/ClassMemberPanel.java
@@ -56,6 +56,10 @@
  *
  * @author Tomas Zezula
  */
+@NavigatorPanel.Registrations({
+    @NavigatorPanel.Registration(mimeType="text/x-java", position=100, displayName="#LBL_members"),
+    @NavigatorPanel.Registration(mimeType="application/x-class-file", displayName="#LBL_members")
+})
 public class ClassMemberPanel implements NavigatorPanel {
 
     private ClassMemberPanelUI component;
diff --git a/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml b/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
--- a/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
+++ b/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
@@ -46,25 +46,6 @@
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 <filesystem>
 
-    <folder name="Navigator">
-        <folder name="Panels">
-            <folder name="text">
-                <folder name="x-java">
-                    <file name="org-netbeans-modules-java-navigation-ClassMemberPanel.instance">
-                        <attr name="position" intvalue="100"/>
-                    </file>
-                    <!-- file name="org-netbeans-modules-java-navigation-InheritanceTreePanel.instance"/ -->
-                </folder>
-            </folder>
-            <folder name="application">
-                <folder name="x-class-file">
-                    <file name="org-netbeans-modules-java-navigation-ClassMemberPanel.instance"/>
-                    <!-- file name="org-netbeans-modules-java-navigation-InheritanceTreePanel.instance"/ -->
-                </folder>
-            </folder>
-        </folder>
-    </folder>
-    
     <folder name="Loaders">
         <folder name="text">
             <folder name="x-java">
diff --git a/maven.grammar/nbproject/project.xml b/maven.grammar/nbproject/project.xml
--- a/maven.grammar/nbproject/project.xml
+++ b/maven.grammar/nbproject/project.xml
@@ -207,7 +207,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.7</specification-version>
+                        <specification-version>1.22</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml b/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
--- a/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
+++ b/maven.grammar/src/org/netbeans/modules/maven/grammar/layer.xml
@@ -131,12 +131,6 @@
         <folder name="Panels">
             <folder name="text">
                 <folder name="x-maven-pom+xml">
-                    <file name="org-netbeans-modules-maven-navigator-POMModelNavigator.instance">
-                        <attr name="position" intvalue="100"/>
-                    </file>
-                    <file name="org-netbeans-modules-maven-navigator-POMInheritanceNavigator.instance">
-                        <attr name="position" intvalue="200"/>
-                    </file>
                     <file name="org-netbeans-modules-xml-text-navigator-XMLNavigatorPanel.instance">
                         <attr name="position" intvalue="300"/>
                     </file>
diff --git a/maven.grammar/src/org/netbeans/modules/maven/navigator/POMInheritanceNavigator.java b/maven.grammar/src/org/netbeans/modules/maven/navigator/POMInheritanceNavigator.java
--- a/maven.grammar/src/org/netbeans/modules/maven/navigator/POMInheritanceNavigator.java
+++ b/maven.grammar/src/org/netbeans/modules/maven/navigator/POMInheritanceNavigator.java
@@ -44,6 +44,7 @@
 
 import java.util.Collection;
 import javax.swing.JComponent;
+import org.netbeans.modules.maven.api.Constants;
 import org.netbeans.spi.navigator.NavigatorPanel;
 import org.openide.loaders.DataObject;
 import org.openide.util.Lookup;
@@ -54,6 +55,7 @@
  *
  * @author mkleint
  */
+@NavigatorPanel.Registration(mimeType=Constants.POM_MIME_TYPE, position=200, displayName="#POM_NAME")
 public class POMInheritanceNavigator implements NavigatorPanel {
     private POMInheritancePanel component;
     
diff --git a/maven.grammar/src/org/netbeans/modules/maven/navigator/POMModelNavigator.java b/maven.grammar/src/org/netbeans/modules/maven/navigator/POMModelNavigator.java
--- a/maven.grammar/src/org/netbeans/modules/maven/navigator/POMModelNavigator.java
+++ b/maven.grammar/src/org/netbeans/modules/maven/navigator/POMModelNavigator.java
@@ -44,6 +44,7 @@
 
 import java.util.Collection;
 import javax.swing.JComponent;
+import org.netbeans.modules.maven.api.Constants;
 import org.netbeans.spi.navigator.NavigatorPanel;
 import org.openide.loaders.DataObject;
 import org.openide.util.Lookup;
@@ -55,6 +56,7 @@
  *
  * @author mkleint
  */
+@NavigatorPanel.Registration(mimeType=Constants.POM_MIME_TYPE, position=100, displayName="#POM_MODEL_NAME")
 public class POMModelNavigator implements NavigatorPanel {
     private POMModelPanel component;
     
diff --git a/o.apache.tools.ant.module/nbproject/project.xml b/o.apache.tools.ant.module/nbproject/project.xml
--- a/o.apache.tools.ant.module/nbproject/project.xml
+++ b/o.apache.tools.ant.module/nbproject/project.xml
@@ -109,7 +109,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <specification-version>1.22</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntNavigatorPanel.java b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntNavigatorPanel.java
--- a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntNavigatorPanel.java
+++ b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntNavigatorPanel.java
@@ -50,6 +50,7 @@
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
+import org.apache.tools.ant.module.loader.AntProjectDataObject;
 import org.netbeans.spi.navigator.NavigatorPanel;
 import org.openide.explorer.ExplorerManager;
 import org.openide.explorer.ExplorerUtils;
@@ -66,6 +67,7 @@
  * Displays Ant targets in the Navigator.
  * @author Jesse Glick
  */
+@NavigatorPanel.Registration(mimeType=AntProjectDataObject.MIME_TYPE, displayName="#ANP_label")
 public final class AntNavigatorPanel implements NavigatorPanel {
     
     private Lookup.Result<DataObject> selection;
diff --git a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
--- a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
+++ b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml
@@ -185,16 +185,6 @@
             </folder>
         </folder>
     </folder>
-    
-    <folder name="Navigator">
-        <folder name="Panels">
-            <folder name="text">
-                <folder name="x-ant+xml">
-                    <file name="org-apache-tools-ant-module-nodes-AntNavigatorPanel.instance"/>
-                </folder>
-            </folder>
-        </folder>
-    </folder>
 
     <folder name="org-apache-tools-ant-module">
         <folder name="target-actions">
diff --git a/spi.navigator/apichanges.xml b/spi.navigator/apichanges.xml
--- a/spi.navigator/apichanges.xml
+++ b/spi.navigator/apichanges.xml
@@ -108,7 +108,25 @@
     <!-- ACTUAL CHANGES BEGIN HERE: -->
 
   <changes>
-
+    <change id="NavigatorPanel.Registration">
+        <api name="navigator_api"/>
+        <summary>Added <code>@NavigatorPanel.Registration</code></summary>
+        <version major="1" minor="22"/>
+        <date year="2012" month="1" day="12"/>
+        <author login="glick"/>
+        <compatibility binary="compatible" source="compatible" deprecation="no" deletion="no" addition="yes">
+            <p>
+                Upgrade manual layer registrations.
+            </p>
+        </compatibility>
+        <description>
+            <p>
+                Added <code>@NavigatorPanel.Registration</code> for ease of use and lazy loading.
+            </p>
+        </description>
+        <class package="org.netbeans.spi.navigator" name="NavigatorPanel"/>
+        <issue number="206954"/>
+    </change>
     <change id="NavigatorDisplayer">
         <api name="navigator_api"/>
         <summary>Added SPI interface NavigatorDisplayer</summary>
diff --git a/spi.navigator/arch.xml b/spi.navigator/arch.xml
--- a/spi.navigator/arch.xml
+++ b/spi.navigator/arch.xml
@@ -78,8 +78,6 @@
    <p>
    API allows its clients to plug in their Swing based views easily, which 
    then will be automatically shown in specialized Navigator UI.</p>
-   <p>
-   Client's views are registered through declarative xml layers approach.</p>
    
    <api group="java" name="org.netbeans.spi.navigator.NavigatorPanel" category="stable" type="export" />
    <api group="java" name="org.netbeans.spi.navigator.NavigatorHandler" category="devel" type="export" />
@@ -146,13 +144,8 @@
     
    <usecase id="basicUsage" name="Basic Usage Steps" >
       In order to plug in a view into Navigator UI for certain document (data) type,
-      module writers need to complete following steps:
-
-      <ul>
-        <li><b>Write <a href="@TOP@/org/netbeans/spi/navigator/NavigatorPanel.html">NavigatorPanel</a>
-         implementation</b></li>
-        <li><b>Register implementation class in xml layer</b></li>
-      </ul>
+      module writers need to write a <a href="@TOP@/org/netbeans/spi/navigator/NavigatorPanel.html">NavigatorPanel</a>
+      implementation marked with <code>@Registration</code>.
 
       <h4>Writing NavigatorPanel implementation</h4>
         <p>Implementing <a href="@TOP@/org/netbeans/spi/navigator/NavigatorPanel.html">NavigatorPanel</a>
@@ -163,10 +156,7 @@
 
         <ul>
             <li><b>Instantiation:</b> Your implementation of NavigatorPanel
-            is instantied automatically by the system if you register it in a layer
-            (described in next step). See detailed 
-            <a href="@org-openide-util@/org/openide/util/doc-files/api.html#instances">Instantiation rules</a>
-            to understand which kind of instantiation possibilities are on the plate.<p></p></li>
+            is instantied automatically by the system if you register it using <code>@Registration</code>.</li>
 
             <li><b>getComponent</b> method: Simply create and return your UI
             representation of your data in Swing's JComponent envelope. Just be sure
@@ -209,7 +199,7 @@
             should show some please wait message.<p></p></li>
         </ul>
 
-      <h4>Registering NavigatorPanel impl in a layer</h4>
+      <h4>Registering NavigatorPanel impl</h4>
        <p>Declarative registration of your NavigatorPanel impl connects this
         implementation with specific content type, which is type of 
         the document, expressed in mime-type syntax, for example 'text/x-java'
@@ -217,26 +207,7 @@
         your NavigatorPanel impl in UI, when <b>currently activated Node
         is backed by primary FileObject whose 
         <a href="@org-openide-filesystems@/org/openide/filesystems/FileObject.html#getMIMEType()">FileObject.getMimeType()</a>
-        equals to content type specified in your layer.</b></p>
-        <p>  
-        Writing layer registration itself is easy, you can again copy from template layer
-         <a href="@TOP@/org/netbeans/spi/navigator/doc-files/basicNavLayer.xml">
-        Basic Navigator Registration Layer</a>.</p>
-
-        Additional important info:
-
-        <ul>
-            <li>System looks up for navigator providers only in
-            <b>Navigator/Panels</b> folder, nowhere else.<p></p></li>
-
-            <li>Content type is specified as cascade of subdirectories under
-                Navigator/Panels directory. Mime-type syntax is recommended and
-                handy for specifying content type.<br></br>
-                It is not compulsory though, so if you need to make up a name
-                for your content type, just go for it. (more below)<p></p></li>
- 
-        </ul>
-        
+        equals to content type specified in your registering annotation</b> (see more options below).</p>
    </usecase> 
 
    <usecase id="lookupHint" name="Advanced Content Registration - Linking to Node's Lookup" >
@@ -1372,8 +1343,7 @@
  <answer id="resources-read">
   <p>
    Yes Navigator module reads registered view providers from specific folder
-   /navigator/panels.
-   
+   Navigator/Panels.
   </p>
  </answer>
 
diff --git a/spi.navigator/manifest.mf b/spi.navigator/manifest.mf
--- a/spi.navigator/manifest.mf
+++ b/spi.navigator/manifest.mf
@@ -2,4 +2,4 @@
 OpenIDE-Module: org.netbeans.spi.navigator/1
 OpenIDE-Module-Layer: org/netbeans/modules/navigator/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/navigator/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
diff --git a/spi.navigator/src/org/netbeans/modules/navigator/LazyPanel.java b/spi.navigator/src/org/netbeans/modules/navigator/LazyPanel.java
new file mode 100644
--- /dev/null
+++ b/spi.navigator/src/org/netbeans/modules/navigator/LazyPanel.java
@@ -0,0 +1,115 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.navigator;
+
+import java.util.Map;
+import javax.swing.JComponent;
+import org.netbeans.spi.navigator.NavigatorPanel;
+import org.netbeans.spi.navigator.NavigatorPanelWithUndo;
+import org.openide.awt.UndoRedo;
+import org.openide.util.Lookup;
+
+/**
+ * Delegating panel for use from {@link NavigatorPanel.Registration}.
+ */
+public class LazyPanel implements NavigatorPanelWithUndo {
+
+    /**
+     * Referenced from generated layer.
+     */
+    public static NavigatorPanel create(Map<String,?> attrs) {
+        return new LazyPanel(attrs);
+    }
+
+    private final Map<String,?> attrs;
+    private NavigatorPanel delegate;
+
+    private LazyPanel(Map<String,?> attrs) {
+        this.attrs = attrs;
+    }
+
+    private synchronized NavigatorPanel initialize() {
+        if (delegate == null) {
+            delegate = (NavigatorPanel) attrs.get("delegate");
+        }
+        return delegate;
+    }
+
+    @Override public String getDisplayName() {
+        if (delegate != null) {
+            return delegate.getDisplayName();
+        } else {
+            return (String) attrs.get("displayName");
+        }
+    }
+
+    @Override public String getDisplayHint() {
+        if (delegate != null) {
+            return delegate.getDisplayHint();
+        } else { // unused currently, so no separate attr
+            return (String) attrs.get("displayName");
+        }
+    }
+
+    @Override public JComponent getComponent() {
+        return initialize().getComponent();
+    }
+
+    @Override public void panelActivated(Lookup context) {
+        initialize().panelActivated(context);
+    }
+
+    @Override public void panelDeactivated() {
+        initialize().panelDeactivated();
+    }
+
+    @Override public Lookup getLookup() {
+        return initialize().getLookup();
+    }
+
+    @Override public UndoRedo getUndoRedo() {
+        NavigatorPanel p = initialize();
+        return p instanceof NavigatorPanelWithUndo ? ((NavigatorPanelWithUndo) p).getUndoRedo() : UndoRedo.NONE;
+    }
+
+}
diff --git a/spi.navigator/src/org/netbeans/modules/navigator/NavigatorPanelRegistrationProcessor.java b/spi.navigator/src/org/netbeans/modules/navigator/NavigatorPanelRegistrationProcessor.java
new file mode 100644
--- /dev/null
+++ b/spi.navigator/src/org/netbeans/modules/navigator/NavigatorPanelRegistrationProcessor.java
@@ -0,0 +1,100 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2012 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.modules.navigator;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import javax.annotation.processing.Processor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedSourceVersion;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import org.netbeans.spi.navigator.NavigatorPanel;
+import org.openide.filesystems.annotations.LayerGeneratingProcessor;
+import org.openide.filesystems.annotations.LayerGenerationException;
+import org.openide.util.lookup.ServiceProvider;
+
+@ServiceProvider(service=Processor.class)
+@SupportedSourceVersion(SourceVersion.RELEASE_6)
+public class NavigatorPanelRegistrationProcessor extends LayerGeneratingProcessor {
+
+    @Override public Set<String> getSupportedAnnotationTypes() {
+        return new HashSet<String>(Arrays.asList(NavigatorPanel.Registration.class.getCanonicalName(), NavigatorPanel.Registrations.class.getCanonicalName()));
+    }
+
+    @Override protected boolean handleProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) throws LayerGenerationException {
+        if (roundEnv.processingOver()) {
+            return false;
+        }
+        for (Element e : roundEnv.getElementsAnnotatedWith(NavigatorPanel.Registration.class)) {
+            NavigatorPanel.Registration r = e.getAnnotation(NavigatorPanel.Registration.class);
+            if (r == null) {
+                continue;
+            }
+            register(e, r);
+        }
+        for (Element e : roundEnv.getElementsAnnotatedWith(NavigatorPanel.Registrations.class)) {
+            NavigatorPanel.Registrations rr = e.getAnnotation(NavigatorPanel.Registrations.class);
+            if (rr == null) {
+                continue;
+            }
+            for (NavigatorPanel.Registration r : rr.value()) {
+                register(e, r);
+            }
+        }
+        return true;
+    }
+
+    private void register(Element e, NavigatorPanel.Registration r) throws LayerGenerationException {
+        String suffix = layer(e).instanceFile("dummy", null, null, r, null).getPath().substring("dummy".length()); // e.g. /my-Panel.instance
+        layer(e).file(ProviderRegistry.PANELS_FOLDER + r.mimeType() + suffix).
+                methodvalue("instanceCreate", LazyPanel.class.getName(), "create").
+                instanceAttribute("delegate", NavigatorPanel.class, r, null).
+                position(r.position()).
+                bundlevalue("displayName", r.displayName()).
+                write();
+    }
+
+}
diff --git a/spi.navigator/src/org/netbeans/modules/navigator/ProviderRegistry.java b/spi.navigator/src/org/netbeans/modules/navigator/ProviderRegistry.java
--- a/spi.navigator/src/org/netbeans/modules/navigator/ProviderRegistry.java
+++ b/spi.navigator/src/org/netbeans/modules/navigator/ProviderRegistry.java
@@ -60,7 +60,7 @@
 class ProviderRegistry {
     
     /** folder in layer file system where navigator panels are searched for */
-    private static final String PANELS_FOLDER = "/Navigator/Panels/"; //NOI18N
+    static final String PANELS_FOLDER = "Navigator/Panels/"; //NOI18N
     /** template for finding all NavigatorPanel instances in lookup */
     private static final Lookup.Template<NavigatorPanel> NAV_PANEL_TEMPLATE = 
             new Lookup.Template<NavigatorPanel>(NavigatorPanel.class);
diff --git a/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanel.java b/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanel.java
--- a/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanel.java
+++ b/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanel.java
@@ -44,14 +44,17 @@
 
 package org.netbeans.spi.navigator;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import javax.swing.JComponent;
 import org.openide.util.Lookup;
 
 /** Navigation related view description.
  *
- * Implementors of this interface, also registered in layer,
- * will be plugged into Navigator UI.
- *
+ * Implementors of this interface will be plugged into Navigator UI.
+ * @see Registration
  * @author Dafe Simonek
  */
 public interface NavigatorPanel {
@@ -63,7 +66,7 @@
     public String getDisplayName ();
 
     /** Description of the view, explaining main purpose of the view.
-     * Will be shown in Navigator UI.
+     * <em>Currently unused.</em>
      * 
      * @return String description of the view.
      */
@@ -120,6 +123,44 @@
      * @return Lookup instance or null
      */
     public Lookup getLookup ();
+
+    /**
+     * Registers a navigator panel.
+     * @since 1.22
+     */
+    @Target({ElementType.TYPE, ElementType.METHOD})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Registration {
+
+        /**
+         * MIME type to register under.
+         * For example: {@code text/javascript}
+         */
+        String mimeType();
+
+        /**
+         * Optional position for this panel among others of the same type.
+         */
+        int position() default Integer.MAX_VALUE;
+
+        /**
+         * Label for this view to be used in a switcher UI.
+         * Will be replaced with {@link NavigatorPanel#getDisplayName}
+         * if and when the panel is actually shown.
+         * May use {@code pkg.Bundle#key} or {@code #key} syntax.
+         */
+        String displayName();
+
+    }
     
-    
+    /**
+     * Used in case multiple registrations are needed in one place.
+     * @since 1.22
+     */
+    @Target({ElementType.TYPE, ElementType.METHOD})
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Registrations {
+        Registration[] value();
+    }
+
 }
diff --git a/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanelWithUndo.java b/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanelWithUndo.java
--- a/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanelWithUndo.java
+++ b/spi.navigator/src/org/netbeans/spi/navigator/NavigatorPanelWithUndo.java
@@ -52,8 +52,8 @@
  * Clients will implement this interface when they need undo and redo support
  * enabled for their Navigator view/panel.
  *
- * Implementors of this interface, also registered in layer,
- * will be plugged into Navigator UI.
+ * Implementors of this interface will be plugged into Navigator UI.
+ * @see NavigatorPanel.Registration
  * 
  * @since 1.5
  *
diff --git a/spi.navigator/src/org/netbeans/spi/navigator/doc-files/BasicNavPanelImpl_java b/spi.navigator/src/org/netbeans/spi/navigator/doc-files/BasicNavPanelImpl_java
--- a/spi.navigator/src/org/netbeans/spi/navigator/doc-files/BasicNavPanelImpl_java
+++ b/spi.navigator/src/org/netbeans/spi/navigator/doc-files/BasicNavPanelImpl_java
@@ -53,6 +53,7 @@
 /**
  * Basic dummy implementation of NavigatorPanel interface.
  */
+@NavigatorPanel.Registration(mimeType="text/plain", displayName="Dummy View")
 public class BasicNavPanelImpl implements NavigatorPanel {
 
     /** holds UI of this panel */
diff --git a/spi.navigator/src/org/netbeans/spi/navigator/doc-files/basicNavLayer.xml b/spi.navigator/src/org/netbeans/spi/navigator/doc-files/basicNavLayer.xml
deleted file mode 100644
--- a/spi.navigator/src/org/netbeans/spi/navigator/doc-files/basicNavLayer.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-Contributor(s):
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
--->
-<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.0//EN" "http://www.netbeans.org/dtds/filesystem-1_0.dtd">
-
-<filesystem>
-    <folder name="Navigator">
-        <folder name="Panels">
-            <!-- Sudirectory structure below represents content type in mime type syntax.
-                 Replace with content type your navigator view will show  -->
-            <folder name="text">
-                <folder name="plain">
-                    <!-- NavigatorPanel implementation, replace with your own -->
-                    <file name="org-netbeans-modules-some_module-SomeTextPlainProvider.instance"/>
-                </folder>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
-