From 4e435893eed3190631c70ae27dea905442330cfc Mon Sep 17 00:00:00 2001
From: Max Schenkelberg <max.schenkelberg@raytheon.com>
Date: Wed, 28 Aug 2013 11:05:41 -0500
Subject: [PATCH] Issue #2033 Fixed aviation plugin issues

Change-Id: I911e5424b3d269fdc6138c7113d9de18badc85ba

Former-commit-id: a3db693c09ec2139f0f037d0fee20f1ca0758ecd [formerly ecf702ae8dd18d28715a9ea4a68e9406fe9b8b21] [formerly 11cdb2e0fd9cc1d825ddc922e95dae7c1cdc187a] [formerly 11cdb2e0fd9cc1d825ddc922e95dae7c1cdc187a [formerly 578ad148f44468be9dd6b45e384e9fe6d7fa8056]] [formerly 6abf647f044545f151552a5212771c4a3d44d8d4 [formerly 11cdb2e0fd9cc1d825ddc922e95dae7c1cdc187a [formerly 578ad148f44468be9dd6b45e384e9fe6d7fa8056] [formerly 6abf647f044545f151552a5212771c4a3d44d8d4 [formerly a8f6a4f58ee2c89e56d6fdfface15379ef7b9bad]]]]
Former-commit-id: 6abf647f044545f151552a5212771c4a3d44d8d4
Former-commit-id: 2901a5156c7569ddb5cb99b52d870444ab63bd03 [formerly 96289a5ff59078a1d57fabf113aaafc84fce16d1] [formerly 930ec1706d1f508a0e714430802be835e8429deb [formerly 1a558d247b629f28ffaef8ae1f92621564b957a3]]
Former-commit-id: 930ec1706d1f508a0e714430802be835e8429deb
Former-commit-id: 52334d9efb4986d4f12bbf87ed3198802f59339c
---
 .../uf/viz/core/localization/BundleScanner.java        | 10 +++++++---
 .../viz/core/localization/LocalizationInitializer.java |  7 ++++---
 cave/com.raytheon.viz.avnfps.feature/feature.xml       |  3 +--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java
index c04fbcd2a1..57d18a1dfe 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java
+++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/BundleScanner.java
@@ -119,14 +119,18 @@ public class BundleScanner {
         File file = null;
         Bundle bundle = getBundle(bundleToSearch);
         if (bundle != null && bundle.getState() != Bundle.UNINSTALLED) {
-            URL url = FileLocator.find(bundle, new Path(basePath
-                    + IPathManager.SEPARATOR + pathToLookFor), null);
+            String path = basePath;
+            if (pathToLookFor != null
+                    && pathToLookFor.trim().isEmpty() == false) {
+                path += IPathManager.SEPARATOR + pathToLookFor;
+            }
+            URL url = FileLocator.find(bundle, new Path(path), null);
             if (url != null) {
                 URL resolvedURL = null;
                 try {
                     resolvedURL = FileLocator.toFileURL(url);
                 } catch (IOException e) {
-
+                    
                 }
                 if (resolvedURL != null) {
                     file = new File(resolvedURL.getPath());
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
index 036772020e..9fa72603ad 100644
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
+++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
@@ -76,10 +76,11 @@ public class LocalizationInitializer {
         LocalizationContext baseContext = pm.getContext(
                 LocalizationType.CAVE_CONFIG, LocalizationLevel.BASE);
         String filePath = "config.xml";
-        for (String bundle : BundleScanner.getListOfBundles()) {
-            File copyFrom = BundleScanner.searchInBundle(bundle, "", filePath);
+        BundleScanner scanner = new BundleScanner(filePath);
+        for (String bundle : scanner.getContributingBundles()) {
+            File copyFrom = scanner.searchInBundle(bundle, null);
             if (copyFrom != null) {
-                String searchPath = bundle + File.separator + filePath;
+                String searchPath = bundle + IPathManager.SEPARATOR + filePath;
                 File copyTo = pm.getFile(baseContext, searchPath);
                 if (copyTo.exists() == false
                         || copyFrom.lastModified() != copyTo.lastModified()) {
diff --git a/cave/com.raytheon.viz.avnfps.feature/feature.xml b/cave/com.raytheon.viz.avnfps.feature/feature.xml
index 6a87f6c6a7..d86a1d8988 100644
--- a/cave/com.raytheon.viz.avnfps.feature/feature.xml
+++ b/cave/com.raytheon.viz.avnfps.feature/feature.xml
@@ -33,8 +33,7 @@
          id="com.raytheon.viz.aviation"
          download-size="0"
          install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.raytheon.viz.avnconfig"