Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
View | Details | Raw Unified | Return to bug 193873 | Differences between
and this patch

Collapse All | Expand All

(-)java.api.common/manifest.mf (-1 / +1 lines)
 Lines 1-4    Link Here 
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.java.api.common/0
2
OpenIDE-Module: org.netbeans.modules.java.api.common/0
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
4
OpenIDE-Module-Specification-Version: 1.43
4
OpenIDE-Module-Specification-Version: 1.44
(-)java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java (+2 lines)
 Lines 479-484    Link Here 
479
479
480
            void doRun() {
480
            void doRun() {
481
                Properties p = new Properties();
481
                Properties p = new Properties();
482
                p.put("nb.internal.action.name", command);
482
                String[] targetNames;
483
                String[] targetNames;
483
484
484
                targetNames = getTargetNames(command, context, p, doJavaChecks);
485
                targetNames = getTargetNames(command, context, p, doJavaChecks);
 Lines 491-496    Link Here 
491
                        return ;
492
                        return ;
492
                    }
493
                    }
493
                    Map<String, Object> execProperties = new HashMap<String, Object>();
494
                    Map<String, Object> execProperties = new HashMap<String, Object>();
495
                    execProperties.put("nb.internal.action.name", command);
494
496
495
                    copyMultiValue(ProjectProperties.RUN_JVM_ARGS, execProperties);
497
                    copyMultiValue(ProjectProperties.RUN_JVM_ARGS, execProperties);
496
                    prepareWorkDir(execProperties);
498
                    prepareWorkDir(execProperties);
(-)o.apache.tools.ant.module/nbproject/project.properties (-1 / +1 lines)
 Lines 42-48    Link Here 
42
42
43
javac.compilerargs=-Xlint:unchecked
43
javac.compilerargs=-Xlint:unchecked
44
javac.source=1.6
44
javac.source=1.6
45
spec.version.base=3.62.0
45
spec.version.base=3.64.0
46
compile.ant.jar=${ant.core.lib}
46
compile.ant.jar=${ant.core.lib}
47
src-bridge.cp.extra=build/classes:${compile.ant.jar}
47
src-bridge.cp.extra=build/classes:${compile.ant.jar}
48
extra.module.files=\
48
extra.module.files=\
(-)o.apache.tools.ant.module/nbproject/project.xml (-1 / +1 lines)
 Lines 116-122    Link Here 
116
                    <compile-dependency/>
116
                    <compile-dependency/>
117
                    <run-dependency>
117
                    <run-dependency>
118
                        <release-version>1</release-version>
118
                        <release-version>1</release-version>
119
                        <specification-version>1.32</specification-version>
119
                        <specification-version>1.69</specification-version>
120
                    </run-dependency>
120
                    </run-dependency>
121
                </dependency>
121
                </dependency>
122
                <dependency>
122
                <dependency>
(-)o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/LastTargetExecuted.java (-1 / +43 lines)
 Lines 46-51    Link Here 
46
46
47
import java.io.File;
47
import java.io.File;
48
import java.io.IOException;
48
import java.io.IOException;
49
import java.util.Arrays;
49
import java.util.Map;
50
import java.util.Map;
50
import org.apache.tools.ant.module.AntModule;
51
import org.apache.tools.ant.module.AntModule;
51
import org.apache.tools.ant.module.api.AntProjectCookie;
52
import org.apache.tools.ant.module.api.AntProjectCookie;
 Lines 62-68    Link Here 
62
 * Records the last Ant target(s) that was executed.
63
 * Records the last Ant target(s) that was executed.
63
 * @author Jesse Glick
64
 * @author Jesse Glick
64
 */
65
 */
65
public class LastTargetExecuted implements BuildExecutionSupport.Item {
66
public class LastTargetExecuted implements BuildExecutionSupport.ActionItem {
66
    
67
    
67
    private LastTargetExecuted() {}
68
    private LastTargetExecuted() {}
68
    
69
    
 Lines 152-155    Link Here 
152
        }
153
        }
153
    }
154
    }
154
    
155
    
156
    @Override
157
    public String getAction() {
158
       String p = properties != null ? properties.get("nb.internal.action.name") : null;
159
       return  p != null ? p : "xxx-custom";
155
}
160
}
161
162
    @Override
163
    public FileObject getProjectDirectory() {
164
        return FileUtil.toFileObject(buildScript.getParentFile());
165
    }
166
167
    
168
    //equals + hashcode handle duplicates in history list
169
    @Override
170
    public int hashCode() {
171
        int hash = 7;
172
        hash = 71 * hash + (this.buildScript != null ? this.buildScript.hashCode() : 0);
173
        hash = 71 * hash + Arrays.deepHashCode(this.targets);
174
        hash = 71 * hash + getAction().hashCode();
175
        return hash;
176
    }
177
178
    @Override
179
    public boolean equals(Object obj) {
180
        if (obj == null) {
181
            return false;
182
        }
183
        if (getClass() != obj.getClass()) {
184
            return false;
185
        }
186
        final LastTargetExecuted other = (LastTargetExecuted) obj;
187
        if (this.buildScript != other.buildScript && (this.buildScript == null || !this.buildScript.equals(other.buildScript))) {
188
            return false;
189
        }
190
        if (!Arrays.deepEquals(this.targets, other.targets)) {
191
            return false;
192
        }
193
        return getAction().equals(other.getAction());
194
    }
195
    
196
    
197
}

Return to bug 193873
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo