xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43001 commits 31 branches 40 tags 3.8 GiB
Commit graph

175 commits

Author SHA1 Message Date
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
mjames-upc
bf687306d0 RequiredExecutionEnvironment: JavaSE-1.7 
Former-commit-id: 5b6bc2ace8
 2016-02-03 21:45:47 -06:00
mjames-upc
ac5fbd0019 qpid should buildrequires boost-devel only; typo for viz.dat feature include 
Former-commit-id: 4f6c8be9ec
 2016-01-21 18:52:59 -07:00
mjames-upc
cc362ea73a ui updates from osx cave 
Former-commit-id: 31ab502455
 2015-12-29 23:03:48 -07:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse 
Former-commit-id: 0b01029e68
 2015-12-29 20:15:31 -07:00
mjames-upc
194adffea5 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
 2015-09-03 15:48:53 -06:00
David Lovely
0216db5985 Omaha #4295 Cleaned up CAVE icon locations 
Former-commit-id: e3f7c784ea0dab0bd38e5217a3291f558029e851
 2015-07-23 06:50:16 -05:00
David Lovely
a56f97be01 Omaha #4295 Export icons for CAVE application window. 
Former-commit-id: c516fedfd76cdb32f029b54ad25ed9097aaaf47a
 2015-07-22 14:13:31 -05:00
David Lovely
a4f16b4d20 Omaha #4295 Added branding to Cave 
Former-commit-id: e97cd6fcb31d75b1259dccea564723d7c34ce287
 2015-07-07 06:53:47 -05:00
AWIPS User
ecebf4d2a8 splash update for 14.4.1 
Former-commit-id: 66032c76b2 [formerly c7fa3c2f93] [formerly cf0cc4f474] [formerly d76eea9ba9006f41a8dab13481e146df61026f6f [formerly 2c522ce63aa43ebbb944d047b3e2f96c0a879ee0] [formerly cf0cc4f474 [formerly cb3f3ec20f]]]
Former-commit-id: 1c6699f9c0ab646ed752b4b19c71ff8c8487e0e4 [formerly 27ce5d285082d1c3ef5ae457e1d620540bb29d81] [formerly 921e127f20 [formerly 786284f4e8]]
Former-commit-id: 37af1ae9e097bde852a75370bf67102abb4bd283 [formerly 921e127f20]
Former-commit-id: 55869b74e0
 2015-06-24 19:20:55 -06:00
Nate Jensen
fdc8db7ff8 Omaha #4474 improvements to alertview 
hook developers into alertview
fix various bugs
only show alertview in CAVE menu when enabled

Change-Id: Ia8e0479bd9159690222c5cdc65870a72436090a0

Former-commit-id: cc453b8fb92a96f94fca04cf66ef04125ae22da9
 2015-06-23 16:40:00 -05:00
Nate Jensen
f464c4e871 Omaha #4473 send viz log messages to slf4j 
enable eclipse logging to slf4j
            start alertviz ui through osgi

Change-Id: I54ccd31d9ee0e19dfb2a8c9f63dd5c9730c8c8ca

Former-commit-id: cde25bde94cadc5125ece8d5894c644d54d486e2
 2015-06-04 19:34:10 -05:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked. 
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
 2015-05-19 10:23:35 -05:00
AWIPS User
218279130e reworked Open Bundle (Procedure) and added Save Bundle (Procedure) for use by non-ops 
Former-commit-id: 094ad0c994 [formerly 0ea5413fdb] [formerly 57bb0d322b] [formerly 1bea796911c9ad0fd7fed39ef6f35252bc4f6115 [formerly 89acf7a7aecfd98ce9485b5346df9a709d26f004] [formerly 57bb0d322b [formerly 262a9d4407]]]
Former-commit-id: 4f6081ac7249dd3f49ad3d811be58479ca40ce4d [formerly 8ba3c158ec25d0210ea246d1769daf4584a575bc] [formerly b3766e3d0d [formerly 2d424f3862]]
Former-commit-id: b3766e3d0d
Former-commit-id: aa6834013d
 2015-04-19 18:00:02 -06:00
Nate Jensen
b307b49e81 Omaha #4278 try/catch throwables in dialog components 
Change-Id: Icb349774ff43ced32bdbf2cb9f21712589cfcfdb

Former-commit-id: 9a78fb10bdbe14d77cf29442e1de8a1205c27b66
 2015-03-23 13:19:27 -05:00
Nate Jensen
f9f99ef425 Omaha #4278 try/catch throwables in dialog components 
Change-Id: Icb349774ff43ced32bdbf2cb9f21712589cfcfdb

Former-commit-id: b307b49e81 [formerly 9a78fb10bdbe14d77cf29442e1de8a1205c27b66]
Former-commit-id: 41ae3a02b9
 2015-03-23 13:19:27 -05:00
Lee Venable
e3a4548d52 Omaha #4183 - Fix exception handling in openWindows() 
Former-commit-id: 11f7fbccade83be4c9e985bbf9a26a241fed8fe0
 2015-03-05 10:03:37 -06:00
Lee Venable
6c7f6a3010 Omaha #4183 - Fix exception handling in openWindows() 
Former-commit-id: e3a4548d52 [formerly 11f7fbccade83be4c9e985bbf9a26a241fed8fe0]
Former-commit-id: 8c56eda100
 2015-03-05 10:03:37 -06:00
Steve Harris
7fb303eff1 Merge tag 'OB_14.4.1-15m' into omaha_15.1.1 
Former-commit-id: 4fe28e2a0013f77c8a04a56789fc4e101039d77f
 2015-03-04 21:06:10 -06:00
Steve Harris
38e5142819 Merge tag 'OB_14.4.1-15m' into omaha_15.1.1 
Former-commit-id: 7fb303eff1 [formerly 4fe28e2a0013f77c8a04a56789fc4e101039d77f]
Former-commit-id: 4088396ba5
 2015-03-04 21:06:10 -06:00
David Lovely
e04988d5d2 Omaha #4164 Fixed AlertViz communications issue and log file directories. 
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369
 2015-02-24 08:24:33 -06:00
David Lovely
1c1ab2943a Omaha #4164 Fixed AlertViz communications issue and log file directories. 
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: e04988d5d2 [formerly 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369]
Former-commit-id: d6f74b3e28
 2015-02-24 08:24:33 -06:00
David Lovely
65f0f27036 Omaha #4164 Fixed AlertViz communications issue and log file directories. 
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: e04988d5d2 [formerly 1c1ab2943a [formerly d6f74b3e28] [formerly e04988d5d2 [formerly 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369]]]
Former-commit-id: 1c1ab2943a [formerly d6f74b3e28]
Former-commit-id: 1c1ab2943a
Former-commit-id: 93866e732e
 2015-02-24 08:24:33 -06:00
Mark Peters
4d01175dfa Omaha #3947 CAVE time in practice mode does not default to real time 
Change-Id: If53a9348e75abf69f3395629685f8a26973f9e52

Former-commit-id: 25f9ab8850c1f27f7b896a711fc3c1220ad8a4cd
 2015-01-15 18:06:37 -06:00
Mark Peters
f89786f50e Omaha #3947 CAVE time in practice mode does not default to real time 
Change-Id: If53a9348e75abf69f3395629685f8a26973f9e52

Former-commit-id: 4d01175dfa [formerly 25f9ab8850c1f27f7b896a711fc3c1220ad8a4cd]
Former-commit-id: 96da1cafbe
 2015-01-15 18:06:37 -06:00
mjames-upc
ba80d4303b modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development 
Former-commit-id: e104fc35e2
 2015-01-12 14:07:28 -07:00
mjames-upc
886cd5940f Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development 
Former-commit-id: 7eacf4dc1c
 2015-01-12 14:02:58 -07:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
 2014-12-03 15:47:10 -06:00
Nate Jensen
6c1391e938 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]
Former-commit-id: ec28d2f1a0
 2014-12-03 15:47:10 -06:00
Nate Jensen
e291bd932f Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0]
Former-commit-id: 6c1391e938
Former-commit-id: effb6c68bf
 2014-12-03 15:47:10 -06:00
Max Schenkelberg
1fa0ff4c67 Omaha #3612 Fixed Thin client plugin blacklist 
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42

Former-commit-id: b3f42acd1a8fc814b7fa1e094f1f39f8a374567d
 2014-10-27 13:07:50 -05:00
Max Schenkelberg
c17fd3d774 Omaha #3612 Fixed Thin client plugin blacklist 
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42

Former-commit-id: 1fa0ff4c67 [formerly b3f42acd1a8fc814b7fa1e094f1f39f8a374567d]
Former-commit-id: 629d56f480
 2014-10-27 13:07:50 -05:00
Max Schenkelberg
9544bb5279 Omaha #3612 Fixed Thin client plugin blacklist 
Change-Id: I989656df46a6ebd9dd64c41f44f9335591848d42

Former-commit-id: 1fa0ff4c67 [formerly c17fd3d774 [formerly 629d56f480] [formerly 1fa0ff4c67 [formerly b3f42acd1a8fc814b7fa1e094f1f39f8a374567d]]]
Former-commit-id: c17fd3d774 [formerly 629d56f480]
Former-commit-id: c17fd3d774
Former-commit-id: e93b4867af
 2014-10-27 13:07:50 -05:00
Steve Harris
c9e37bf440 Merge tag 'OB_14.3.1-25m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: 6bb7a7312a22a9585d2f5981d873751879082cb1
 2014-10-07 13:35:58 -05:00
Steve Harris
39b2199cec Merge tag 'OB_14.3.1-25m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]
Former-commit-id: ad4393bea3
 2014-10-07 13:35:58 -05:00
Steve Harris
3c91dfd8b7 Merge tag 'OB_14.3.1-25m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c9e37bf440 [formerly 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]
Former-commit-id: 39b2199cec [formerly ad4393bea3]
Former-commit-id: 39b2199cec
Former-commit-id: c0c1ce7700
 2014-10-07 13:35:58 -05:00
Nate Jensen
87d1286a0c Omaha #2975 fix mkdirs() bug 
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f

Former-commit-id: 3f63e3887f21b1cb5eb1ea1bb5225f492e161021
 2014-10-01 14:22:22 -05:00
Nate Jensen
74883424ca Omaha #2975 fix mkdirs() bug 
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f

Former-commit-id: 87d1286a0c [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]
Former-commit-id: 319ea78480
 2014-10-01 14:22:22 -05:00
Nate Jensen
1610751f51 Omaha #2975 fix mkdirs() bug 
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f

Former-commit-id: 87d1286a0c [formerly 74883424ca [formerly 319ea78480] [formerly 87d1286a0c [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]
Former-commit-id: 74883424ca [formerly 319ea78480]
Former-commit-id: 74883424ca
Former-commit-id: 4dd895a3c5
 2014-10-01 14:22:22 -05:00
Nate Jensen
f2633a56c0 Issue #3679 fix bug when performance pref page changes 
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
 2014-10-01 11:53:40 -05:00
Nate Jensen
fce7d5899f Issue #3679 fix bug when performance pref page changes 
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]
Former-commit-id: 482af416b3
 2014-10-01 11:53:40 -05:00
Nate Jensen
621a2ab225 Issue #3679 fix bug when performance pref page changes 
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: f2633a56c0 [formerly fce7d5899f [formerly 482af416b3] [formerly f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]
Former-commit-id: fce7d5899f [formerly 482af416b3]
Former-commit-id: fce7d5899f
Former-commit-id: 1a4b7cc454
 2014-10-01 11:53:40 -05:00
Nate Jensen
41427a57bb Omaha #3678 don't enable jmx at alertviz or cave startup 
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7

Former-commit-id: 501aa1ac560f34024ab906391dc8c22c422d8509
 2014-10-01 09:46:56 -05:00
Nate Jensen
131f5ec9f7 Omaha #3678 don't enable jmx at alertviz or cave startup 
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7

Former-commit-id: 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]
Former-commit-id: 799ba1babf
 2014-10-01 09:46:56 -05:00
Nate Jensen
6adc04234e Omaha #3678 don't enable jmx at alertviz or cave startup 
Change-Id: Ife722d85de8be57300a49aa3d21be02ff7cf39f7

Former-commit-id: 41427a57bb [formerly 131f5ec9f7 [formerly 799ba1babf] [formerly 41427a57bb [formerly 501aa1ac560f34024ab906391dc8c22c422d8509]]]
Former-commit-id: 131f5ec9f7 [formerly 799ba1babf]
Former-commit-id: 131f5ec9f7
Former-commit-id: 8c3c592190
 2014-10-01 09:46:56 -05:00
Ben Steffensmeier
217caaba15 Omaha #3300 Fix component and mosaic merge problems 
Former-commit-id: 201854ac4154dc8526bf99bde69674ad51ec50ad
 2014-09-19 15:08:21 -05:00
Ben Steffensmeier
766fdd80a8 Omaha #3300 Fix component and mosaic merge problems 
Former-commit-id: 217caaba15 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]
Former-commit-id: 72f5799c44
 2014-09-19 15:08:21 -05:00
Ben Steffensmeier
5d04246977 Omaha #3300 Fix component and mosaic merge problems 
Former-commit-id: 217caaba15 [formerly 766fdd80a8 [formerly 72f5799c44] [formerly 217caaba15 [formerly 201854ac4154dc8526bf99bde69674ad51ec50ad]]]
Former-commit-id: 766fdd80a8 [formerly 72f5799c44]
Former-commit-id: 766fdd80a8
Former-commit-id: 6d8b9df40b
 2014-09-19 15:08:21 -05:00
Steve Harris
4c56844e29 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
 2014-09-19 10:28:57 -05:00
Steve Harris
da530db540 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
 2014-09-19 10:28:57 -05:00