diff --git a/groovy.grailsproject/nbproject/project.xml b/groovy.grailsproject/nbproject/project.xml --- a/groovy.grailsproject/nbproject/project.xml +++ b/groovy.grailsproject/nbproject/project.xml @@ -175,14 +175,6 @@ - org.netbeans.modules.web.client.tools.api - - - - 1.0 - - - org.openide.actions diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandSupport.java @@ -78,12 +78,6 @@ import org.netbeans.modules.groovy.grailsproject.config.BuildConfig; import org.netbeans.modules.groovy.grailsproject.debug.GrailsDebugger; import org.netbeans.modules.groovy.support.api.GroovySettings; -import org.netbeans.modules.web.client.tools.api.JSToNbJSLocationMapper; -import org.netbeans.modules.web.client.tools.api.LocationMappersFactory; -import org.netbeans.modules.web.client.tools.api.NbJSToJSLocationMapper; -import org.netbeans.modules.web.client.tools.api.WebClientToolsProjectUtils; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionException; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionStarterService; import org.openide.awt.HtmlBrowser; import org.openide.filesystems.FileAttributeEvent; import org.openide.filesystems.FileChangeListener; @@ -280,61 +274,13 @@ } public static final void showURL(URL url, boolean debug, GrailsProject project) { - boolean debuggerAvailable = WebClientToolsSessionStarterService.isAvailable(); - - if (!debug || !debuggerAvailable) { + if (!debug) { if (GrailsProjectConfig.forProject(project).getDisplayBrowser()) { HtmlBrowser.URLDisplayer.getDefault().showURL(url); } } else { - FileObject webAppDir = project.getProjectDirectory().getFileObject(WEB_APP_DIR); - GrailsProjectConfig config = GrailsProjectConfig.forProject(project); - - String port = config.getPort(); - String prefix = url.getProtocol() + "://" + url.getHost() + ":" + port + "/" + project.getProjectDirectory().getName(); - String actualURL = url.toExternalForm(); - - Lookup debugLookup; - if (!actualURL.startsWith(prefix)) { - LOGGER.warning("Could not construct URL mapper for JavaScript debugger."); - debugLookup = Lookups.fixed(project); - } else { - LocationMappersFactory factory = Lookup.getDefault().lookup(LocationMappersFactory.class); - - if (factory == null) { - debugLookup = Lookups.fixed(project); - } else { - try { - URI prefixURI = new URI(prefix); - - JSToNbJSLocationMapper forwardMapper = factory.getJSToNbJSLocationMapper(webAppDir, prefixURI, null); - NbJSToJSLocationMapper reverseMapper = factory.getNbJSToJSLocationMapper(webAppDir, prefixURI, null); - - debugLookup = Lookups.fixed(forwardMapper, reverseMapper, project); - } catch (URISyntaxException ex) { - LOGGER.log(Level.WARNING, "Server URI could not be constructed from displayed URL", ex); - debugLookup = Lookups.fixed(project); - } - } - } - - try { - URI launchURI = url.toURI(); - HtmlBrowser.Factory browser = WebClientToolsProjectUtils.getFirefoxBrowser(); - - String browserString = config.getDebugBrowser(); - if (browserString == null) { - browserString = WebClientToolsProjectUtils.Browser.FIREFOX.name(); - } - if (WebClientToolsProjectUtils.Browser.valueOf(browserString) == WebClientToolsProjectUtils.Browser.INTERNET_EXPLORER) { - browser = WebClientToolsProjectUtils.getInternetExplorerBrowser(); - } - WebClientToolsSessionStarterService.startSession(launchURI, browser, debugLookup); - } catch (URISyntaxException ex) { - LOGGER.log(Level.SEVERE, "Unable to obtain URI for URL", ex); - } catch (WebClientToolsSessionException ex) { - LOGGER.log(Level.SEVERE, "Unexpected exception launching javascript debugger", ex); - } + // there is no other debugger than JavaScript is there? + HtmlBrowser.URLDisplayer.getDefault().showURL(url); } } diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/resources/layer.xml @@ -144,10 +144,6 @@ - - - - diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/Bundle.properties @@ -38,10 +38,6 @@ # # Portions Copyrighted 2008 Sun Microsystems, Inc. -DebugCustomizerPanel.firefoxRadioButton.text=&Firefox -DebugCustomizerPanel.internetExplorerRadioButton.text=&Internet Explorer (Windows only) -DebugCustomizerPanel.noSupportedBrowserLabel.text=No supported client-side debugging browsers are configured in the IDE -DebugCustomizerPanel.debugClientLabel.text=Debug Grails Application (Client Side) GeneralCustomizerPanel.grailsServerPortLabel.text=Server Port: GeneralCustomizerPanel.projectFolderTextField.text= GeneralCustomizerPanel.grailsServerPort.text= @@ -60,8 +56,6 @@ LBL_GeneralSettings=General Settings LBL_Libraries=Libraries -DEBUG_CATEGORY=Debug -DebugCustomizerPanel.internetExplorerRadioButton.tooltip=Available on Windows only GeneralCustomizerPanel.grailsDisplayBrowser.text=Display &Browser on Run GeneralCustomizerPanel.vmOptionsLabel.text=&VM Options: GeneralCustomizerPanel.vmOptionsTipLabel.text=(e.g. -Xms10m) diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/DebugCustomizerPanel.form b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/DebugCustomizerPanel.form deleted file mode 100644 --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/DebugCustomizerPanel.form +++ /dev/null @@ -1,102 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/DebugCustomizerPanel.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/DebugCustomizerPanel.java deleted file mode 100644 --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/DebugCustomizerPanel.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 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]" - * - * 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 2008 Sun Microsystems, Inc. - */ - -/* - * DebugCustomizerPanel.java - * - * Created on Jul 12, 2008, 11:15:15 AM - */ - -package org.netbeans.modules.groovy.grailsproject.ui.customizer; - -import org.netbeans.modules.web.client.tools.api.WebClientToolsProjectUtils; - -/** - * - * @author sc32560 - */ -public class DebugCustomizerPanel extends javax.swing.JPanel { - - private GrailsProjectProperties uiProperties; - - private final boolean ieBrowserSupported; - - private final boolean ffBrowserSupported; - - /** Creates new form DebugCustomizerPanel */ - public DebugCustomizerPanel(GrailsProjectProperties uiProperties) { - this.uiProperties = uiProperties; - - initComponents(); - - ieBrowserSupported = WebClientToolsProjectUtils.isInternetExplorerSupported(); - ffBrowserSupported = WebClientToolsProjectUtils.isFirefoxSupported(); - - String browserString = uiProperties.getDebugBrowser(); - WebClientToolsProjectUtils.Browser selectedBrowser = null; - if (browserString == null) { - browserString = (ffBrowserSupported || !ieBrowserSupported) ? WebClientToolsProjectUtils.Browser.FIREFOX.name() : - WebClientToolsProjectUtils.Browser.INTERNET_EXPLORER.name(); - } - selectedBrowser = WebClientToolsProjectUtils.Browser.valueOf(browserString); - - firefoxRadioButton.setSelected(selectedBrowser == WebClientToolsProjectUtils.Browser.FIREFOX); - internetExplorerRadioButton.setSelected(selectedBrowser == WebClientToolsProjectUtils.Browser.INTERNET_EXPLORER); - - firefoxRadioButton.setEnabled(ffBrowserSupported); - internetExplorerRadioButton.setEnabled(ieBrowserSupported); - - noSupportedBrowserLabel.setVisible(!ieBrowserSupported && !ffBrowserSupported); - } - - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - browserButtonGroup = new javax.swing.ButtonGroup(); - debugClientLabel = new javax.swing.JLabel(); - firefoxRadioButton = new javax.swing.JRadioButton(); - internetExplorerRadioButton = new javax.swing.JRadioButton(); - noSupportedBrowserLabel = new javax.swing.JLabel(); - - org.openide.awt.Mnemonics.setLocalizedText(debugClientLabel, org.openide.util.NbBundle.getMessage(DebugCustomizerPanel.class, "DebugCustomizerPanel.debugClientLabel.text")); // NOI18N - - browserButtonGroup.add(firefoxRadioButton); - firefoxRadioButton.setSelected(true); - org.openide.awt.Mnemonics.setLocalizedText(firefoxRadioButton, org.openide.util.NbBundle.getMessage(DebugCustomizerPanel.class, "DebugCustomizerPanel.firefoxRadioButton.text")); // NOI18N - firefoxRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - firefoxRadioButtonActionPerformed(evt); - } - }); - - browserButtonGroup.add(internetExplorerRadioButton); - org.openide.awt.Mnemonics.setLocalizedText(internetExplorerRadioButton, org.openide.util.NbBundle.getMessage(DebugCustomizerPanel.class, "DebugCustomizerPanel.internetExplorerRadioButton.text")); // NOI18N - internetExplorerRadioButton.setToolTipText(org.openide.util.NbBundle.getMessage(DebugCustomizerPanel.class, "DebugCustomizerPanel.internetExplorerRadioButton.tooltip")); // NOI18N - internetExplorerRadioButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - internetExplorerRadioButtonActionPerformed(evt); - } - }); - - org.openide.awt.Mnemonics.setLocalizedText(noSupportedBrowserLabel, org.openide.util.NbBundle.getMessage(DebugCustomizerPanel.class, "DebugCustomizerPanel.noSupportedBrowserLabel.text")); // NOI18N - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); - this.setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(debugClientLabel) - .addGroup(layout.createSequentialGroup() - .addGap(12, 12, 12) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(internetExplorerRadioButton) - .addComponent(firefoxRadioButton))) - .addComponent(noSupportedBrowserLabel)) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addContainerGap() - .addComponent(debugClientLabel) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(firefoxRadioButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(internetExplorerRadioButton) - .addGap(18, 18, 18) - .addComponent(noSupportedBrowserLabel) - .addContainerGap(181, Short.MAX_VALUE)) - ); - }// //GEN-END:initComponents - - private void firefoxRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_firefoxRadioButtonActionPerformed - setBrowser(); - }//GEN-LAST:event_firefoxRadioButtonActionPerformed - - private void internetExplorerRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_internetExplorerRadioButtonActionPerformed - setBrowser(); - }//GEN-LAST:event_internetExplorerRadioButtonActionPerformed - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.ButtonGroup browserButtonGroup; - private javax.swing.JLabel debugClientLabel; - private javax.swing.JRadioButton firefoxRadioButton; - private javax.swing.JRadioButton internetExplorerRadioButton; - private javax.swing.JLabel noSupportedBrowserLabel; - // End of variables declaration//GEN-END:variables - - private void setBrowser() { - uiProperties.setDebugBrowser(internetExplorerRadioButton.isSelected() ? - WebClientToolsProjectUtils.Browser.INTERNET_EXPLORER.name() : - WebClientToolsProjectUtils.Browser.FIREFOX.name()); - } - -} diff --git a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java --- a/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java +++ b/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/customizer/GrailsProjectCustomizerProvider.java @@ -39,7 +39,6 @@ import javax.swing.JComponent; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionStarterService; import org.netbeans.spi.project.ui.CustomizerProvider; import org.netbeans.spi.project.ui.support.ProjectCustomizer; import org.netbeans.spi.project.ui.support.ProjectCustomizer.Category; @@ -137,26 +136,6 @@ }; } - // used from XML layer - public static ProjectCustomizer.CompositeCategoryProvider createDebugging() { - return new ProjectCustomizer.CompositeCategoryProvider() { - public Category createCategory(Lookup context) { - if (WebClientToolsSessionStarterService.isAvailable()) { - return ProjectCustomizer.Category.create( - DEBUG_CATEGORY, - NbBundle.getMessage(GrailsProjectCustomizerProvider.class, "DEBUG_CATEGORY"), // NOI18N - null); - } else { - return null; - } - } - - public JComponent createComponent(Category category, Lookup context) { - return new DebugCustomizerPanel(context.lookup(GrailsProjectProperties.class)); - } - }; - } - private class StoreListener implements ActionListener { private final GrailsProjectProperties uiProperties; diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties --- a/nbbuild/cluster.properties +++ b/nbbuild/cluster.properties @@ -410,7 +410,6 @@ versioning.system.cvss.installer,\ versioning.ui,\ versioning.util,\ - web.client.tools.api,\ web.common,\ web.indent,\ xml,\ @@ -635,7 +634,6 @@ spring.webmvc,\ tomcat5,\ web.beans,\ - web.client.javascript.debugger.ant,\ web.core,\ web.core.syntax,\ web.debug,\ @@ -1155,6 +1153,8 @@ php.phpdoc,\ projectimport.jbuilder,\ uihandler.interactive,\ + web.client.javascript.debugger.ant,\ + web.client.tools.api,\ web.client.tools.common,\ web.client.tools.firefox,\ web.client.tools.firefox.extension,\ diff --git a/php.kit/manifest.mf b/php.kit/manifest.mf --- a/php.kit/manifest.mf +++ b/php.kit/manifest.mf @@ -2,4 +2,4 @@ OpenIDE-Module: org.netbeans.modules.php.kit OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/kit/Bundle.properties OpenIDE-Module-Specification-Version: 1.36 -OpenIDE-Module-Recommends: org.netbeans.modules.web.client.tools.kit,org.netbeans.modules.hudson.php +OpenIDE-Module-Recommends: org.netbeans.modules.hudson.php diff --git a/php.project/nbproject/project.xml b/php.project/nbproject/project.xml --- a/php.project/nbproject/project.xml +++ b/php.project/nbproject/project.xml @@ -269,14 +269,6 @@ - org.netbeans.modules.web.client.tools.api - - - - 1.0 - - - org.netbeans.modules.web.common diff --git a/php.project/src/org/netbeans/modules/php/project/ui/actions/support/CommandUtils.java b/php.project/src/org/netbeans/modules/php/project/ui/actions/support/CommandUtils.java --- a/php.project/src/org/netbeans/modules/php/project/ui/actions/support/CommandUtils.java +++ b/php.project/src/org/netbeans/modules/php/project/ui/actions/support/CommandUtils.java @@ -65,8 +65,6 @@ import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties.XDebugUrlArguments; import org.netbeans.modules.php.project.ui.options.PhpOptions; import org.netbeans.modules.php.project.util.PhpProjectUtils; -import org.netbeans.modules.web.client.tools.api.WebClientToolsProjectUtils; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionStarterService; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; import org.openide.filesystems.FileObject; @@ -375,11 +373,8 @@ * @throws MalformedURLException if any error occurs. */ public static URL urlForDebugProject(PhpProject project, XDebugUrlArguments xDebugArgument) throws MalformedURLException { - DebugInfo debugInfo = getDebugInfo(project); URL debugUrl = urlForProject(project); - if (debugInfo.debugServer) { debugUrl = appendQuery(debugUrl, getDebugArguments(xDebugArgument)); - } return debugUrl; } @@ -437,11 +432,8 @@ * @throws MalformedURLException if any error occurs. */ public static URL urlForDebugContext(PhpProject project, Lookup context, XDebugUrlArguments xDebugArgument) throws MalformedURLException { - DebugInfo debugInfo = getDebugInfo(project); URL debugUrl = urlForContext(project, context); - if (debugInfo.debugServer) { debugUrl = appendQuery(debugUrl, getDebugArguments(xDebugArgument)); - } return debugUrl; } @@ -462,24 +454,6 @@ return baseDirectory; } - /** - * Get {@link DebugInfo debug information} for a project (server side debugging, - * client side debugging). - * @param project a project to get information for. - * @return {@link DebugInfo debug information} for a project. - */ - public static DebugInfo getDebugInfo(PhpProject project) { - boolean debugServer = WebClientToolsProjectUtils.getServerDebugProperty(project); - boolean debugClient = WebClientToolsProjectUtils.getClientDebugProperty(project); - - if (!WebClientToolsSessionStarterService.isAvailable()) { - debugServer = true; - debugClient = false; - } - assert debugServer || debugClient; - return new DebugInfo(debugClient, debugServer); - } - public static URL getBaseURL(PhpProject project) throws MalformedURLException { return getBaseURL(project, false); } @@ -577,17 +551,4 @@ return (!retval.isEmpty()) ? retval.toArray(new FileObject[retval.size()]) : null; } - /** - * Holder class for debug information for a project (server side debugging, - * client side debugging). - */ - public static final class DebugInfo { - public final boolean debugClient; - public final boolean debugServer; - - public DebugInfo(boolean debugClient, boolean debugServer) { - this.debugClient = debugClient; - this.debugServer = debugServer; - } - } } diff --git a/php.project/src/org/netbeans/modules/php/project/ui/actions/support/ConfigActionLocal.java b/php.project/src/org/netbeans/modules/php/project/ui/actions/support/ConfigActionLocal.java --- a/php.project/src/org/netbeans/modules/php/project/ui/actions/support/ConfigActionLocal.java +++ b/php.project/src/org/netbeans/modules/php/project/ui/actions/support/ConfigActionLocal.java @@ -43,7 +43,6 @@ package org.netbeans.modules.php.project.ui.actions.support; import java.net.MalformedURLException; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.util.concurrent.Callable; @@ -55,20 +54,12 @@ import org.netbeans.modules.php.project.spi.XDebugStarter; import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties.DebugUrl; import org.netbeans.modules.php.project.ui.customizer.PhpProjectProperties.XDebugUrlArguments; -import org.netbeans.modules.php.project.util.PhpProjectUtils; -import org.netbeans.modules.web.client.tools.api.JSToNbJSLocationMapper; -import org.netbeans.modules.web.client.tools.api.LocationMappersFactory; -import org.netbeans.modules.web.client.tools.api.NbJSToJSLocationMapper; -import org.netbeans.modules.web.client.tools.api.WebClientToolsProjectUtils; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionException; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionStarterService; import org.openide.awt.HtmlBrowser; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; import org.openide.util.Cancellable; import org.openide.util.Exceptions; import org.openide.util.Lookup; -import org.openide.util.lookup.Lookups; /** * Action implementation for LOCAL configuration. @@ -142,22 +133,10 @@ Runnable runnable = new Runnable() { @Override public void run() { - try { if (urlToShow[0] != null) { - if (CommandUtils.getDebugInfo(project).debugClient) { - try { - launchJavaScriptDebugger(urlToShow[0]); - } catch (URISyntaxException ex) { - Exceptions.printStackTrace(ex); - } - } else { HtmlBrowser.URLDisplayer.getDefault().showURL(urlToShow[0]); } } - } catch (MalformedURLException ex) { - Exceptions.printStackTrace(ex); - } - } }; Cancellable cancellable = new Cancellable() { @@ -171,15 +150,6 @@ }; - boolean jsDebuggingAvailable = WebClientToolsSessionStarterService.isAvailable(); - if (jsDebuggingAvailable) { - boolean keepDebugging = WebClientToolsProjectUtils.showDebugDialog(project); - if (!keepDebugging) { - return; - } - } - - if (!jsDebuggingAvailable || WebClientToolsProjectUtils.getServerDebugProperty(project)) { //temporary; after narrowing deps. will be changed XDebugStarter dbgStarter = XDebugStarterFactory.getInstance(); if (dbgStarter != null) { @@ -192,9 +162,6 @@ startDebugger(dbgStarter, runnable, cancellable, FileUtil.toFileObject(RunConfigLocal.forProject(project).getIndexFile())); } } - } else { - runnable.run(); - } } @Override @@ -268,21 +235,8 @@ @Override public void run() { if (urlForStartDebugging != null) { - try { - if (CommandUtils.getDebugInfo(project).debugClient) { - try { - launchJavaScriptDebugger(urlForStartDebugging); - } catch (URISyntaxException ex) { - Exceptions.printStackTrace(ex); - } - } else { HtmlBrowser.URLDisplayer.getDefault().showURL(urlForStartDebugging); } - } catch (MalformedURLException ex) { - //TODO improve error handling - Exceptions.printStackTrace(ex); - } - } } }; @@ -296,15 +250,6 @@ } }; - boolean jsDebuggingAvailable = WebClientToolsSessionStarterService.isAvailable(); - if (jsDebuggingAvailable) { - boolean keepDebugging = WebClientToolsProjectUtils.showDebugDialog(project); - if (!keepDebugging) { - return; - } - } - - if (!jsDebuggingAvailable || WebClientToolsProjectUtils.getServerDebugProperty(project)) { XDebugStarter dbgStarter = XDebugStarterFactory.getInstance(); if (dbgStarter != null) { if (dbgStarter.isAlreadyRunning()) { @@ -316,9 +261,6 @@ startDebugger(dbgStarter, runnable, cancellable, selectedFile); } } - } else { - runnable.run(); - } } protected void preShowUrl(Lookup context) { @@ -338,42 +280,6 @@ dbgStarter.start(project, initDebuggingCallable, props); } - private void launchJavaScriptDebugger(URL url) throws MalformedURLException, URISyntaxException { - LocationMappersFactory mapperFactory = Lookup.getDefault().lookup(LocationMappersFactory.class); - Lookup debuggerLookup = null; - if (mapperFactory != null) { - URI appContext = CommandUtils.getBaseURL(project).toURI(); - FileObject[] srcRoots = PhpProjectUtils.getSourceObjects(project); - - JSToNbJSLocationMapper forwardMapper = - mapperFactory.getJSToNbJSLocationMapper(srcRoots, appContext, null); - NbJSToJSLocationMapper reverseMapper = - mapperFactory.getNbJSToJSLocationMapper(srcRoots, appContext, null); - debuggerLookup = Lookups.fixed(forwardMapper, reverseMapper, project); - } else { - debuggerLookup = Lookups.fixed(project); - } - - URI clientUrl = url.toURI(); - - HtmlBrowser.Factory browser = null; - if (WebClientToolsProjectUtils.isInternetExplorer(project)) { - browser = WebClientToolsProjectUtils.getInternetExplorerBrowser(); - } else { - browser = WebClientToolsProjectUtils.getFirefoxBrowser(); - } - - if (browser == null) { - HtmlBrowser.URLDisplayer.getDefault().showURL(url); - } else { - try { - WebClientToolsSessionStarterService.startSession(clientUrl, browser, debuggerLookup); - } catch (WebClientToolsSessionException ex) { - Exceptions.printStackTrace(ex); - } - } - } - private static final class StopDebuggingException extends Exception { private static final long serialVersionUID = -22807171434417714L; } diff --git a/web.client.tools.api/nbproject/project.xml b/web.client.tools.api/nbproject/project.xml --- a/web.client.tools.api/nbproject/project.xml +++ b/web.client.tools.api/nbproject/project.xml @@ -64,15 +64,12 @@ - org.netbeans.modules.groovy.grailsproject - org.netbeans.modules.php.project org.netbeans.modules.ruby.railsprojects org.netbeans.modules.web.client.javascript.debugger.ant org.netbeans.modules.web.client.tools.common org.netbeans.modules.web.client.tools.firefox org.netbeans.modules.web.client.tools.internetexplorer org.netbeans.modules.web.client.tools.impl - org.netbeans.modules.web.project org.netbeans.modules.web.client.tools.api org.netbeans.modules.web.client.tools.spi diff --git a/web.kit/manifest.mf b/web.kit/manifest.mf --- a/web.kit/manifest.mf +++ b/web.kit/manifest.mf @@ -2,6 +2,5 @@ OpenIDE-Module: org.netbeans.modules.web.kit OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/kit/Bundle.properties OpenIDE-Module-Specification-Version: 1.14 -OpenIDE-Module-Recommends: org.netbeans.modules.web.client.tools.kit, - org.netbeans.modules.web.project.framework +OpenIDE-Module-Recommends: org.netbeans.modules.web.project.framework diff --git a/web.kit/nbproject/project.xml b/web.kit/nbproject/project.xml --- a/web.kit/nbproject/project.xml +++ b/web.kit/nbproject/project.xml @@ -109,12 +109,6 @@ - org.netbeans.modules.web.client.javascript.debugger.ant - - 0.6 - - - org.netbeans.modules.web.core 2 diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml --- a/web.project/nbproject/project.xml +++ b/web.project/nbproject/project.xml @@ -335,14 +335,6 @@ - org.netbeans.modules.web.client.tools.api - - - - 1.0 - - - org.netbeans.modules.web.common diff --git a/web.project/src/org/netbeans/modules/web/project/WebActionProvider.java b/web.project/src/org/netbeans/modules/web/project/WebActionProvider.java --- a/web.project/src/org/netbeans/modules/web/project/WebActionProvider.java +++ b/web.project/src/org/netbeans/modules/web/project/WebActionProvider.java @@ -99,8 +99,6 @@ import org.netbeans.modules.java.api.common.project.BaseActionProvider; import org.netbeans.modules.java.api.common.project.ProjectProperties; import org.netbeans.modules.web.api.webmodule.RequestParametersQuery; -import org.netbeans.modules.web.client.tools.api.WebClientToolsProjectUtils; -import org.netbeans.modules.web.client.tools.api.WebClientToolsSessionStarterService; import org.netbeans.modules.web.jsps.parserapi.JspParserAPI; import org.netbeans.modules.web.jsps.parserapi.JspParserFactory; import org.netbeans.modules.web.jsps.parserapi.PageInfo; @@ -319,10 +317,6 @@ String targetNames[]; if (command.equals(COMMAND_DEBUG_SINGLE)) { targetNames = new String[]{"debug"}; - boolean keepDebugging = setJavaScriptDebuggerProperties(p); - if (!keepDebugging) { - return null; - } } else { targetNames = new String[]{"run"}; } @@ -376,10 +370,6 @@ if (!isSelectedServer()) { return null; } - boolean keepDebugging = setJavaScriptDebuggerProperties(p); - if (!keepDebugging) { - return null; - } initWebServiceProperties(p); } else if (command.equals(COMMAND_COMPILE_SINGLE)) { String res[] = super.getTargetNames(command, context, p, doJavaChecks); @@ -613,29 +603,6 @@ } } - private boolean setJavaScriptDebuggerProperties(Properties p) { - if (!WebClientToolsSessionStarterService.isAvailable()) { - // If JavaScript debugger is not available, set to server debugging only - p.setProperty("debug.client", "false"); // NOI18N - p.setProperty("debug.server", "true"); // NOI18N - return true; - } else { - // display Debug Project Dialog - boolean keepDebugging = WebClientToolsProjectUtils.showDebugDialog(getProject()); - if (!keepDebugging) { - return false; - } - - boolean debugServer = WebClientToolsProjectUtils.getServerDebugProperty(getProject()); - boolean debugClient = WebClientToolsProjectUtils.getClientDebugProperty(getProject()); - - p.setProperty("debug.client", String.valueOf(debugClient)); // NOI18N - p.setProperty("debug.server", String.valueOf(debugServer)); // NOI18N - - return true; - } - } - /* Deletes translated class/java file to force recompilation of the page with all includes */ public void invalidateClassFile(FileObject jsp) {