From 3e9a285b5eeaa8cbb3220af12d15d98863b79069 Mon Sep 17 00:00:00 2001
From: ucar-tmeyer <tiffanym@ucar.edu>
Date: Fri, 27 Oct 2023 14:37:48 +0000
Subject: [PATCH] Minor updates to AWIPS

-Remove the LAPS Tools menu entry and reference since we don't have this data
-Remove print statement about "No base Apps_defaults file found" since we don't use this
---
 .../menus/tools/baseTools-menuL.xml           | 43 -------------------
 .../localization/menus/tools/toolsindex.xml   |  1 -
 .../raytheon/uf/common/ohd/AppsDefaults.java  |  5 +--
 3 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml

diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml
deleted file mode 100644
index 9e3e3e8f76..0000000000
--- a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-    <!-- 
-        This is an absolute override file, indicating that a higher priority 
-        version of the file will completely replace a lower priority version
-        of the file. 
-    -->
-<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="command"
-        commandId="com.raytheon.viz.awipstools.lapstools" menuText="LAPS tools..."
-        id="lapsTools" />
-    <!-- example arbitrary command below, commandAction parameter is required, _
-    the others default to false if undefined.  If captureOutput is true then after 
-    the launched command closes a dialog box will show the contents printed to 
-    standard output.  If showStdOut is true then standard output will be echoed on 
-    standard out of cave ( not very useful ) -->
-    <!--  
-    <contribute xsi:type="command"
-        commandId="com.raytheon.viz.awipstools.arbitrary" menuText="ps -A">
-        <parameter key="commandAction" value="/bin/ps -A" />
-        <parameter key="captureOutput" value="true" />
-        <parameter key="showStdOut" value="false" />
-    </contribute>
-    -->
-</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml
index c8338af515..790f609746 100644
--- a/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml
@@ -31,7 +31,6 @@
     <include installTo="menu:tools?after=tools.E" fileName="menus/tools/baseTools-menuE.xml"/>
     <include installTo="menu:tools?after=tools.Fe" fileName="menus/tools/baseTools-menuF.xml"/>
     <include installTo="menu:tools?after=tools.H" fileName="menus/tools/baseTools-menuH.xml"/>
-    <include installTo="menu:tools?after=tools.L" fileName="menus/tools/baseTools-menuL.xml"/>
     <include installTo="menu:tools?after=tools.Pu" fileName="menus/tools/baseTools-menuP.xml"/>
     <include installTo="menu:tools?after=tools.Ran" fileName="menus/tools/baseTools-menuR.xml"/>
     <include installTo="menu:tools?after=tools.S" fileName="menus/tools/baseTools-menuS.xml"/>
diff --git a/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java b/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java
index 47d8fbce17..f5b59ed7f0 100644
--- a/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java
+++ b/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java
@@ -296,10 +296,7 @@ public class AppsDefaults {
             if (_appsDefaultsNationalFile.exists()) {
                 logger.info("Setting base Apps_defaults file: "
                         + _appsDefaultsNationalFile);
-            } else {
-                logger.error("No base Apps_defaults file found.");
-            }
-
+            } 
             if (this.appsDefaultsObserver == null) {
                 appsDefaultsObserver = new ILocalizationPathObserver() {
                     @Override