1. Jan Lahoda
  2. jet-main

Commits

Tomas Mysik  committed bc6d72d

Remove useless API

Will be used for proper project configurations later.

  • Participants
  • Parent commits a910d0f
  • Branches default

Comments (0)

Files changed (12)

File cordova.platforms/manifest.mf

View file
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.cordova.platforms
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cordova/platforms/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
 

File cordova.platforms/nbproject/project.xml

View file
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.42</specification-version>
+                        <specification-version>1.64</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

File cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java

View file
 import org.netbeans.modules.web.clientproject.spi.platform.ProjectConfigurationCustomizer;
 import org.netbeans.modules.web.clientproject.spi.platform.RefreshOnSaveListener;
 import org.netbeans.spi.project.ActionProvider;
-import org.netbeans.spi.project.ProjectConfigurationProvider;
 
 /**
  * @author Jan Becicka
     }
     
     @Override
-    public ProjectConfigurationProvider getProjectConfigurationProvider() {
-        return null;
-    }
-
-    @Override
     public ActionProvider getActionProvider() {
         return actionProvider;
     }

File cordova/manifest.mf

View file
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.cordova
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cordova/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
 OpenIDE-Module-Layer: org/netbeans/modules/cordova/resources/layer.xml

File cordova/nbproject/project.xml

View file
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.54</specification-version>
+                        <specification-version>1.64</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

File cordova/src/org/netbeans/modules/cordova/project/CordovaBrowserImpl.java

View file
 import org.netbeans.modules.web.clientproject.spi.platform.ProjectConfigurationCustomizer;
 import org.netbeans.modules.web.clientproject.spi.platform.RefreshOnSaveListener;
 import org.netbeans.spi.project.ActionProvider;
-import org.netbeans.spi.project.ProjectConfigurationProvider;
 import org.openide.util.Exceptions;
 
 /**
     }
 
     @Override
-    public ProjectConfigurationProvider getProjectConfigurationProvider() {
-        return null;
-    }
-
-    @Override
     public boolean isAutoRefresh() {
         return false;
     }

File web.clientproject.api/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.web.clientproject.api
 OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/api/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.63
+OpenIDE-Module-Specification-Version: 1.64
 

File web.clientproject.api/src/org/netbeans/modules/web/clientproject/spi/platform/ClientProjectEnhancedBrowserImplementation.java

View file
     
     boolean isAutoRefresh();
 
-    /**
-     * Configurations provider associated with this browser.
-     * @return
-     */
-    ProjectConfigurationProvider getProjectConfigurationProvider();
 }

File web.clientproject/manifest.mf

View file
 OpenIDE-Module: org.netbeans.modules.web.clientproject
 OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.58
+OpenIDE-Module-Specification-Version: 1.59
 OpenIDE-Module-Provides: org.netbeans.modules.web.clientproject

File web.clientproject/nbproject/project.xml

View file
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.62</specification-version>
+                        <specification-version>1.64</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

File web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProject.java

View file
 import org.netbeans.modules.web.common.api.UsageLogger;
 import org.netbeans.modules.web.common.spi.ProjectWebRootProvider;
 import org.netbeans.spi.project.AuxiliaryConfiguration;
-import org.netbeans.spi.project.ProjectConfigurationProvider;
 import org.netbeans.spi.project.support.LookupProviderSupport;
 import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
 import org.netbeans.spi.project.support.ant.AntProjectEvent;
 import org.openide.util.NbBundle;
 import org.openide.util.WeakListeners;
 import org.openide.util.lookup.Lookups;
-import org.openide.util.lookup.ProxyLookup;
 import org.openide.windows.WindowManager;
 import org.openide.windows.WindowSystemEvent;
 import org.openide.windows.WindowSystemListener;
     final AntProjectHelper projectHelper;
     private final ReferenceHelper referenceHelper;
     private final PropertyEvaluator eval;
-    private final DynamicProjectLookup lookup;
+    private final Lookup lookup;
     private final AntProjectListener antProjectListenerImpl = new AntProjectListenerImpl();
     volatile String name;
     private RefreshOnSaveListener refreshOnSaveListener;
         referenceHelper = new ReferenceHelper(helper, configuration, eval);
         projectBrowserProvider = new ClientSideProjectBrowserProvider(this);
         lookup = createLookup(configuration);
-        ClientProjectEnhancedBrowserImplementation ebi = getEnhancedBrowserImpl();
-        if (ebi != null) {
-            lookup.setConfigurationProvider(ebi.getProjectConfigurationProvider());
-        }
         eval.addPropertyChangeListener(new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                     }
                     projectEnhancedBrowserImpl = null;
                     projectWebBrowser = null;
-                    ebi = getEnhancedBrowserImpl();
-                    if (ebi != null) {
-                        lookup.setConfigurationProvider(ebi.getProjectConfigurationProvider());
-                    }
                     projectBrowserProvider.activeBrowserHasChanged();
                 }
             }
                 projectHelper.getPropertyProvider(AntProjectHelper.PROJECT_PROPERTIES_PATH));
     }
 
-    private DynamicProjectLookup createLookup(AuxiliaryConfiguration configuration) {
+    private Lookup createLookup(AuxiliaryConfiguration configuration) {
         FileEncodingQueryImplementation fileEncodingQuery =
                 new FileEncodingQueryImpl(getEvaluator(), ClientSideProjectConstants.PROJECT_ENCODING);
         Lookup base = Lookups.fixed(new Object[] {
                new ProjectDirectoriesProviderImpl(),
                new CoverageProviderImpl(this),
        });
-       return new DynamicProjectLookup(this,
-               LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-web-clientproject/Lookup"));
+       return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-web-clientproject/Lookup");
     }
 
     void recompileSources(CssPreprocessor cssPreprocessor) {
         CssPreprocessors.getDefault().process(cssPreprocessor, this, siteRootFolder);
     }
 
-    private static class DynamicProjectLookup extends ProxyLookup {
-        private Lookup base;
-        private ClientSideProject project;
-
-        private DynamicProjectLookup(ClientSideProject project, Lookup base) {
-            super(base);
-            this.project = project;
-            this.base = base;
-        }
-
-        public void setConfigurationProvider(ProjectConfigurationProvider provider) {
-            if (provider == null) {
-                setLookups(base);
-            } else {
-                setLookups(base, Lookups.fixed(provider));
-            }
-        }
-    }
-
     ClassPath getSourceClassPath() {
         if (sourcePath == null) {
             sourcePath = ClassPathProviderImpl.createProjectClasspath(this);
                 cordova = projectDirectory.getFileObject("hooks"); // NOI18N
             }
             FileObject testsFolder = project.getTestsFolder(false);
-            
+
             boolean hasGrunt = projectDirectory.getFileObject("Gruntfile.js") != null;
             boolean hasBower = projectDirectory.getFileObject("bower.json") !=null;
             boolean hasPackage = projectDirectory.getFileObject("package.json") !=null;

File web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java

View file
 import org.netbeans.modules.web.clientproject.spi.platform.RefreshOnSaveListener;
 import org.netbeans.modules.web.clientproject.ui.browser.BrowserConfigurationPanel;
 import org.netbeans.spi.project.ActionProvider;
-import org.netbeans.spi.project.ProjectConfigurationProvider;
 import org.netbeans.spi.project.support.ant.AntProjectHelper;
 import org.netbeans.spi.project.support.ant.EditableProperties;
 
         }
     }
 
-    @Override
-    public ProjectConfigurationProvider getProjectConfigurationProvider() {
-        return null;
-    }
-
     private class ProjectConfigurationCustomizerImpl implements ProjectConfigurationCustomizer {
 
         private BrowserConfigurationPanel panel;