# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: C:\Users\mkleint\src\core-main2 # 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: java.api.common/manifest.mf --- java.api.common/manifest.mf Base (BASE) +++ java.api.common/manifest.mf Locally Modified (Based On LOCAL) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.java.api.common/0 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.43 +OpenIDE-Module-Specification-Version: 1.44 Index: java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java --- java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java Base (BASE) +++ java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java Locally Modified (Based On LOCAL) @@ -479,6 +479,7 @@ void doRun() { Properties p = new Properties(); + p.put("nb.internal.action.name", command); String[] targetNames; targetNames = getTargetNames(command, context, p, doJavaChecks); @@ -491,6 +492,7 @@ return ; } Map execProperties = new HashMap(); + execProperties.put("nb.internal.action.name", command); copyMultiValue(ProjectProperties.RUN_JVM_ARGS, execProperties); prepareWorkDir(execProperties); Index: o.apache.tools.ant.module/nbproject/project.properties --- o.apache.tools.ant.module/nbproject/project.properties Base (BASE) +++ o.apache.tools.ant.module/nbproject/project.properties Locally Modified (Based On LOCAL) @@ -42,7 +42,7 @@ javac.compilerargs=-Xlint:unchecked javac.source=1.6 -spec.version.base=3.62.0 +spec.version.base=3.64.0 compile.ant.jar=${ant.core.lib} src-bridge.cp.extra=build/classes:${compile.ant.jar} extra.module.files=\ 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) @@ -116,7 +116,7 @@ 1 - 1.32 + 1.69 Index: o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/LastTargetExecuted.java --- o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/LastTargetExecuted.java Base (BASE) +++ o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/LastTargetExecuted.java Locally Modified (Based On LOCAL) @@ -46,6 +46,7 @@ import java.io.File; import java.io.IOException; +import java.util.Arrays; import java.util.Map; import org.apache.tools.ant.module.AntModule; import org.apache.tools.ant.module.api.AntProjectCookie; @@ -62,7 +63,7 @@ * Records the last Ant target(s) that was executed. * @author Jesse Glick */ -public class LastTargetExecuted implements BuildExecutionSupport.Item { +public class LastTargetExecuted implements BuildExecutionSupport.ActionItem { private LastTargetExecuted() {} @@ -152,4 +153,45 @@ } } + @Override + public String getAction() { + String p = properties != null ? properties.get("nb.internal.action.name") : null; + return p != null ? p : "xxx-custom"; } + + @Override + public FileObject getProjectDirectory() { + return FileUtil.toFileObject(buildScript.getParentFile()); + } + + + //equals + hashcode handle duplicates in history list + @Override + public int hashCode() { + int hash = 7; + hash = 71 * hash + (this.buildScript != null ? this.buildScript.hashCode() : 0); + hash = 71 * hash + Arrays.deepHashCode(this.targets); + hash = 71 * hash + getAction().hashCode(); + return hash; + } + + @Override + public boolean equals(Object obj) { + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final LastTargetExecuted other = (LastTargetExecuted) obj; + if (this.buildScript != other.buildScript && (this.buildScript == null || !this.buildScript.equals(other.buildScript))) { + return false; + } + if (!Arrays.deepEquals(this.targets, other.targets)) { + return false; + } + return getAction().equals(other.getAction()); + } + + +}