# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /Users/beci/source/jet-main # 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: ant.kit/nbproject/project.xml --- ant.kit/nbproject/project.xml Base (BASE) +++ ant.kit/nbproject/project.xml Locally Modified (Based On LOCAL) @@ -6,13 +6,6 @@ org.netbeans.modules.ant.kit - org.apache.tools.ant.module - - 3 - 3.27 - - - org.netbeans.modules.ant.browsetask 1.12 Index: nbbuild/cluster.properties --- nbbuild/cluster.properties Base (BASE) +++ nbbuild/cluster.properties Locally Modified (Based On LOCAL) @@ -348,6 +348,7 @@ o.apache.commons.io,\ o.apache.commons.lang,\ o.apache.commons.logging,\ + o.apache.tools.ant.module,\ o.apache.ws.commons.util,\ o.apache.xml.resolver,\ o.apache.xmlrpc,\ @@ -542,7 +543,6 @@ maven.repository,\ maven.search,\ maven.spring,\ - o.apache.tools.ant.module,\ o.jdesktop.beansbinding,\ options.java,\ projectimport.eclipse.core,\ @@ -1142,10 +1142,6 @@ contrib/tanui,\ contrib/websvc.saas.services.rtm,\ contrib/whichproject,\ - cordova,\ - cordova.platforms,\ - cordova.platforms.android,\ - cordova.platforms.ios,\ j2ee.websphere6,\ j2me.cdc.platform.bdj,\ j2me.cdc.project.bdj,\ @@ -1175,6 +1171,10 @@ nb.cluster.ide,\ nb.cluster.platform nb.cluster.webcommon=\ + cordova,\ + cordova.platforms,\ + cordova.platforms.android,\ + cordova.platforms.ios,\ javascript.jstestdriver,\ languages.apacheconf,\ languages.ini,\ Index: o.apache.tools.ant.module/nbproject/project.xml --- o.apache.tools.ant.module/nbproject/project.xml Base (BASE) +++ o.apache.tools.ant.module/nbproject/project.xml Locally Modified (Based On LOCAL) @@ -86,14 +86,6 @@ - org.netbeans.modules.options.java - - - - 1.0 - - - org.netbeans.modules.project.indexingbridge Index: o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java --- o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java Base (BASE) +++ o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java Locally Modified (Based On LOCAL) @@ -59,7 +59,6 @@ import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.swing.SwingUtilities; -import org.netbeans.modules.options.java.api.JavaOptions; import org.netbeans.spi.options.OptionsPanelController; import org.openide.DialogDisplayer; import org.openide.NotifyDescriptor; @@ -75,7 +74,7 @@ * Implementation of one panel in Options Dialog. * @author Jan Jancura, Jesse Glick */ -@OptionsPanelController.Keywords(keywords={"ant"}, location=JavaOptions.JAVA, tabTitle= "#Ant") +@OptionsPanelController.Keywords(keywords={"ant"}, location="Advanced", tabTitle= "#Ant") public class AntCustomizer extends JPanel implements ActionListener { private static final RequestProcessor RP = new RequestProcessor(AntCustomizer.class); Index: o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntPanelController.java --- o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntPanelController.java Base (BASE) +++ o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntPanelController.java Locally Modified (Based On LOCAL) @@ -46,7 +46,6 @@ import java.beans.PropertyChangeListener; import javax.swing.JComponent; -import org.netbeans.modules.options.java.api.JavaOptions; import org.netbeans.spi.options.OptionsPanelController; import org.openide.util.HelpCtx; import org.openide.util.Lookup; @@ -57,11 +56,11 @@ * @author Jan Jancura */ @OptionsPanelController.SubRegistration( - location=JavaOptions.JAVA, + location="Advanced", id=AntPanelController.OPTIONS_SUBPATH, displayName="#Ant", keywords="#KW_AntOptions", - keywordsCategory=JavaOptions.JAVA + "/Ant" + keywordsCategory="Advanced" + "/Ant" // toolTip="#Ant_Tooltip" ) public final class AntPanelController extends OptionsPanelController { Index: o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java --- o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java Base (BASE) +++ o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java Locally Modified (Based On LOCAL) @@ -74,7 +74,6 @@ import org.netbeans.api.options.OptionsDisplayer; import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; -import org.netbeans.modules.options.java.api.JavaOptions; import org.openide.ErrorManager; import org.openide.LifecycleManager; import org.openide.awt.Actions; @@ -320,7 +319,7 @@ } public void actionPerformed(ActionEvent e) { - OptionsDisplayer.getDefault().open(JavaOptions.JAVA + "/" + AntPanelController.OPTIONS_SUBPATH); // NOI18N + OptionsDisplayer.getDefault().open("Advanced" + "/" + AntPanelController.OPTIONS_SUBPATH); // NOI18N } }