Commit graph

45 commits

Author SHA1 Message Date
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
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
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
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
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
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
Max Schenkelberg
422ceffbdd Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb

Former-commit-id: 994605c1ce [formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]
Former-commit-id: 3ea9b1b4be
2014-09-10 15:43:19 -05:00
Brian.Dyke
fe85eb9f70 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
Brian Clements
981390eb22 Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly b3482522860408c2d052261e845899cf73c2ce96]
Former-commit-id: b352bd3944
2014-08-29 08:55:58 -05:00
Nate Jensen
f84e89b694 Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]
Former-commit-id: dbbf012a34
2014-08-26 16:45:00 -05:00
Brian Clements
bcc3e405e5 Issue #3500 remove locking on osgi internals, rework gfe client startup
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent

Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2

Former-commit-id: 9f7905b58d [formerly b0ea9a2a04cf043fe1a9e4dbf4d4498b0d3f4684]
Former-commit-id: d62db22874
2014-08-22 08:56:56 -05:00
Max Schenkelberg
b3aed99142 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]
Former-commit-id: 16046a4dde
2014-01-06 17:03:45 -06:00
Steve Harris
8aac57e096 Merge branch 'omaha_14.2.1' into development
Former-commit-id: 64f8564cd8 [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]
Former-commit-id: 0950a8a1ba
2013-12-18 13:14:27 -06:00
Ben Steffensmeier
bf508b4455 Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]
Former-commit-id: a37db9d1b4
2013-12-11 12:45:11 -06:00
Max Schenkelberg
be45102814 Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 987d4b3a30 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]
Former-commit-id: 9d846aa104
2013-12-09 15:14:01 -06:00
Nate Jensen
757ca42a5f Issue #2361 don't initialize SerializationUtil's JAXBContext in CAVE
startup

Change-Id: Iefa9c48f264c3ab4cf9d225d3e6420399c8b6700

Former-commit-id: 78b01f61c4 [formerly 264b7c80cbd0559c175aef0a99d8f8407b6af7d0]
Former-commit-id: dd99aa3f47
2013-11-14 17:41:24 -06:00
Nate Jensen
e65d392677 Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 938e4a3073 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]
Former-commit-id: 5e2ebbaad8
2013-10-22 12:42:41 -05:00
Nate Jensen
3f107e931f Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: d265f4ddf4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]
Former-commit-id: 323f594de4
2013-10-15 14:23:59 -05:00
Max Schenkelberg
8a500677d3 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 2d1db7d0e2 [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]
Former-commit-id: b633f9987a
2013-09-09 10:10:11 -05:00
Jonathan Sanchez
58fcc4c896 Issue #2139 Loaded maps at cave start up.
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: de24b8b431 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]
Former-commit-id: a2328f0e06
2013-07-02 11:04:26 -05:00
Jonathan Sanchez
70ab67c3e5 Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."
This reverts commit ab8acf06e1 [formerly 81aad09d06] [formerly e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]].


Former-commit-id: 7f74926bb4 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]
Former-commit-id: c883b4e636
2013-07-01 10:40:48 -05:00
Jonathan Sanchez
ab8acf06e1 Issue #2139 Run async job for loading maps in warngen.
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

Former-commit-id: e4c0188c14 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]
Former-commit-id: 81aad09d06
2013-06-25 15:29:08 -05:00
Steve Harris
6384018950 13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
2013-06-10 15:17:17 -04:00
Steve Harris
be236eb722 13.4.1-14 baseline
Former-commit-id: 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]
Former-commit-id: c749e122eb
2013-06-06 15:15:27 -04:00
Steve Harris
8072752c77 13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 4c6ff79e71
2013-05-13 12:58:10 -04:00
Steve Harris
99f4569650 13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: d33e5861aa
2013-05-02 10:00:38 -05:00
Steve Harris
be96282207 13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
2013-03-25 13:27:13 -05:00
Steve Harris
d66ad2f77b 13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: d0752de66c
2013-02-07 16:00:39 -06:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Steve Harris
c2839cc86d 12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Steven Harris
0e86bfd1d3 12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: 618aa3f316
2012-09-27 15:57:45 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Steve Harris
c26a22cfb7 Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 64ddef69b6 [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]
Former-commit-id: e2989d1a9f
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
0104e1970d Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee

Former-commit-id: 8cf7360e3b [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]
Former-commit-id: 28c7e6bc22
2012-02-15 17:10:34 -06:00
Steve Harris
46dda7b8bd Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]
Former-commit-id: 2119a1513e
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
6e95175ba2 Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98

Former-commit-id: f7985bff7b [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]
Former-commit-id: ebbbd0bafc
2012-02-10 12:13:34 -06:00
Steve Harris
695e2979c3 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]
Former-commit-id: 1002555dbd
2012-02-09 08:54:18 -06:00
Max Schenkelberg
be37f19c90 Issue #206 - Fixed loading and disposing bugs in tear off menus
Issue #206 Fixed bugs in maps menu and other dynamically created menus


Former-commit-id: a7ccea5eda [formerly 875c90104e80d95798956330e24b59d83ef52942]
Former-commit-id: 370e20f0ae
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
2e37808e48 Issue #235 Ability to screen capture or print multiple frames at once.
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7

Former-commit-id: c74dae631e [formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]
Former-commit-id: e904dadb5e
2012-02-07 15:33:23 -06:00
Matt Nash
892cb9a7ae Issue #26 add tear off code to git baseline
Former-commit-id: 4286cb0342 [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]
Former-commit-id: cf4e1f764e
2012-01-25 12:50:31 -06:00
Bryan Kowal
be61ec82b0 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: ff44a81ceb [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]
Former-commit-id: 48b420cbb2
2012-01-23 12:36:13 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00