From 1c60c28dbccd2c996b275afc8cfb15dc49a08450 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Thu, 22 Dec 2022 14:37:38 +0000 Subject: [PATCH] Default CAVE/Thin Client setup with Alertview (also changes in awips2-core) cave/build/p2-build.xml -Added alertview feature to be built by rpms cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt -Removed cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java -Removed plugin blacklist cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java -Changed defaults to POLL instead of PUSH, and to POLL every 1 minute (instead of 5) --- cave/build/p2-build.xml | 4 +- .../ThinClientPluginBlacklist.txt | 61 ------------------- .../thinclient/cave/ThinClientComponent.java | 30 +-------- .../preferences/PreferenceInitializer.java | 4 +- 4 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index 92f35cdb37..276b047831 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -295,7 +295,9 @@ - + + + diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt b/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt deleted file mode 100644 index 6e057604a8..0000000000 --- a/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt +++ /dev/null @@ -1,61 +0,0 @@ -# Warngen -com.raytheon.viz.warngen -# GFe Perspective -com.raytheon.viz.gfe -com.raytheon.viz.ghg -# AvnFPS -com.raytheon.viz.aviation -com.raytheon.viz.avnconfig -# MPE -com.raytheon.viz.mpe -com.raytheon.viz.mpe.ui -# Hydro -com.raytheon.viz.hydrobase -com.raytheon.viz.hydrocommon -com.raytheon.viz.hydro -# ncep -gov.noaa.nws.ncep.viz.ui.perspectives -gov.noaa.nws.ncep.ui.nctextui -gov.noaa.nws.ncep.viz.cloudHeight -gov.noaa.nws.ncep.viz.rsc.airmet -gov.noaa.nws.ncep.viz.rsc.atcf -gov.noaa.nws.ncep.viz.rsc.convsigmet -gov.noaa.nws.ncep.viz.rsc.ffa -gov.noaa.nws.ncep.viz.rsc.ffg -gov.noaa.nws.ncep.viz.rsc.idft -gov.noaa.nws.ncep.viz.rsc.intlsig -gov.noaa.nws.ncep.viz.rsc.lightning -gov.noaa.nws.ncep.viz.rsc.mosaic -gov.noaa.nws.ncep.viz.rsc.ncgrid -gov.noaa.nws.ncep.viz.rsc.ncscat -gov.noaa.nws.ncep.viz.rsc.nonconvsigmet -gov.noaa.nws.ncep.viz.rsc.plotdata -gov.noaa.nws.ncep.viz.rsc.satellite -gov.noaa.nws.ncep.viz.rsc.svrl -gov.noaa.nws.ncep.viz.rsc.warn -gov.noaa.nws.ncep.viz.rsc.wcn -gov.noaa.nws.ncep.viz.rsc.wcp -gov.noaa.nws.ncep.viz.rsc.wstm -gov.noaa.nws.ncep.viz.rsc.wou -#localization -com.raytheon.uf.viz.localization.perspective -org.eclipse.wst.xml.ui -com.python.pydev -com.python.pydev.analysis -com.python.pydev.codecompletion -com.python.pydev.debug -com.python.pydev.fastparser -com.python.pydev.refactoring -org.python.pydev -org.python.pydev.ast -org.python.pydev.core -org.python.pydev.customizations -org.python.pydev.debug -org.python.pydev.django -org.python.pydev.help -org.python.pydev.jython -org.python.pydev.parser -org.python.pydev.refactoring -org.python.pydev.shared_core -org.python.pydev.shared_interactive_console -org.python.pydev.shared_ui \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java index dca22bfe46..7da204395f 100644 --- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java +++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java @@ -78,7 +78,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE; * Dec 04, 2015 5169 bsteffen Allow ProductAlertObserver to send messages * to the AutoUpdater * Feb 08, 2016, 5281 tjensen Combined Data and Menu Refresh Intervals - * + * May 05, 2017 mjames Removed thinclient blacklist * * * @author njensen @@ -117,34 +117,6 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent { ThinClientURICatalog.getInstance(); ThinClientDataUpdateTree.getInstance(); - List pluginBlacklist = new ArrayList(); - File blacklistFile = BundleScanner.searchInBundle( - com.raytheon.uf.viz.thinclient.cave.Activator.PLUGIN_ID, "", - "ThinClientPluginBlacklist.txt"); - if (blacklistFile != null && blacklistFile.exists()) { - BufferedReader reader = null; - try { - reader = new BufferedReader(new FileReader(blacklistFile)); - String line = null; - while (null != (line = reader.readLine())) { - pluginBlacklist.add(line.trim()); - } - } finally { - if (reader != null) { - reader.close(); - } - } - } - try { - for (Bundle b : Activator.getDefault().getContext().getBundles()) { - if (pluginBlacklist.contains(b.getSymbolicName())) { - b.stop(); - b.uninstall(); - } - } - } catch (Throwable t) { - t.printStackTrace(); - } } @Override diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java index c6dcee086a..a9e275cb8c 100644 --- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java +++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java @@ -68,7 +68,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { * method will be used. */ store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD, - ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH); + ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL); store.setDefault( ThinClientPreferenceConstants.P_ENABLE_REQUEST_COMPRESSION, @@ -80,7 +80,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer { // Default data refresh rate store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_INTERVAL, - 5); + 1); // By default, no proxy used store.setDefault(ThinClientPreferenceConstants.P_USE_PROXIES, false);