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

Issue #2052 Fix FeatureExplorer feature comparison

Browse source 
* fixes complaint when feature A includes features B and C
  which both include feature D.
  Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change

Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7

Former-commit-id: 0b2839fd43 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]
Former-commit-id: 4621271329
This commit is contained in:
Everett Kladstrup 2013-05-29 17:14:29 -05:00
parent 4eb7d951e4
commit 9ad045d141
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

@ -188,7 +188,7 @@ public class FeatureExplorer {
plugin.getVersion()); plugin.getVersion());
try { try {
if (this.pluginLookupMap.containsKey(plugin.getId()) if (this.pluginLookupMap.containsKey(plugin.getId())
&& this.pluginLookupMap.get(plugin.getId()).equals(aFile)) { && !this.pluginLookupMap.get(plugin.getId()).equals(aFile)) {
StringBuilder stringBuilder = new StringBuilder("Plugin "); StringBuilder stringBuilder = new StringBuilder("Plugin ");
stringBuilder.append(plugin.getId()); stringBuilder.append(plugin.getId());
stringBuilder.append(" is in Feature "); stringBuilder.append(" is in Feature ");