xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1927 - patch ant includegen task" into development

Browse source 
Former-commit-id: dc9623df11 [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]
Former-commit-id: a4457f8c83
Former-commit-id: 270269219c
This commit is contained in:
Greg Armendariz 2013-05-23 09:10:11 -05:00 • committed by Gerrit Code Review
commit 7c97422501
5 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
cave/build/lib/ant/FeatureExplorer.jar
View file

Binary file not shown.

BIN
cave/build/lib/ant/IncludesGen.jar
View file

Binary file not shown.

BIN
edexOsgi/build.edex/lib/ant/FeatureExplorer.jar
View file

Binary file not shown.

BIN
edexOsgi/build.edex/lib/ant/IncludesGen.jar
View file

Binary file not shown.

3
javaUtilities/com.raytheon.uf.featureexplorer/src/com/raytheon/uf/featureexplorer/FeatureExplorer.java
View file

@ -35,6 +35,7 @@ import com.raytheon.uf.featureexplorer.search.IPluginSearch;
* Oct 7, 2008 SP#15 bclement Changed ArrayList references to List
* Oct 10, 2008 SP#15 bclement Added static functions for reading manifests
* Feb 4, 2013 #1577 bkowal Verify that a plugin has not been included in more than one feature.
* May 22, 2013 #1927 bkowal Fix improper String comparison
* </pre>
*
* @author dglazesk
@ -187,7 +188,7 @@ public class FeatureExplorer {
plugin.getVersion());
try {
if (this.pluginLookupMap.containsKey(plugin.getId())
&& this.pluginLookupMap.get(plugin.getId()) != aFile) {
&& this.pluginLookupMap.get(plugin.getId()).equals(aFile)) {
StringBuilder stringBuilder = new StringBuilder("Plugin ");
stringBuilder.append(plugin.getId());
stringBuilder.append(" is in Feature ");