Commit graph

3602 commits

Author SHA1 Message Date
Nate Jensen
7920053e2f Merge "Omaha #3356 more removal of unnecessary register buddies" into omaha_14.4.1
Former-commit-id: 90e8451dd089de67278368ca665da0cfc5bb6740
2014-09-09 09:23:28 -05:00
Brian Clements
21ded3ea69 Omaha #3570 http client API changes
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f

Former-commit-id: d4edd51d41a306010a7fec2a7ed2c0cd6186506a
2014-09-09 08:47:32 -05:00
Nate Jensen
b46f23d01b Omaha #3356 more removal of unnecessary register buddies
Change-Id: Ic91c2d5ab93bb220a69be23c54640edae26302a3

Former-commit-id: 39bfb8fd0548c74ed9a4e95b914e90ab2f6ad526
2014-09-08 17:18:22 -05:00
Chris Cody
9e823a47d6 Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48

Former-commit-id: 97000cc70e8d826b3e8828a1731278673e0ac635
2014-09-05 10:14:14 -05:00
Nate Jensen
cf41d7e3a3 Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 03fc1d04092135970a6c7089bcbbf11d5c584dd1
2014-09-04 13:49:36 -05:00
Nate Jensen
b332434b49 Omaha #3356 remove unnecessary register buddy to uf.viz.core
Change-Id: I95915b6f1d458a5bb581eec79d40af8bc94122f4

Former-commit-id: a46d5914ae58ad1c3410cdf8d7e67cf856e4c2bd
2014-09-03 16:10:53 -05:00
Nate Jensen
9d462e1dd9 Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13

Former-commit-id: b535d54c52c3e38bb9fa083ba911ad49c090f214
2014-09-03 11:34:10 -05:00
Nate Jensen
362fee1984 Omaha #3356 remove unnecessary dependency
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2

Former-commit-id: c60ca3a16e348216c582f30bc95d8d35ef81e312
2014-09-03 10:53:30 -05:00
Nate Jensen
40d4abe4cd Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: 89de611bd1abdd016ae8a96db4c820004c52b406
2014-09-03 10:00:11 -05:00
Mark Peters
ee36d09cb0 Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032

Former-commit-id: 725354074d54112c8658dc34a8ac564739acbebb
2014-09-02 16:31:44 -05:00
Ben Steffensmeier
e32037b42a Omaha #3390 Remove references to deprecated API.
Former-commit-id: ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3
2014-09-02 15:39:45 -05:00
Ron Anderson
aa6835147b Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
Former-commit-id: 31578a50044053da2ecf14697764bfac2ee8ac8d
2014-09-02 12:08:44 -05:00
Nate Jensen
653d594382 Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba
2014-09-02 10:14:08 -05:00
Nate Jensen
fe457e89a7 Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 09d7406f13949cf6a90164b06742c80ba2e18110
2014-09-02 09:53:25 -05:00
Nate Jensen
13f1a5a8ab Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 172d733902e6430de4f776eed3ad4cd6a94164a5
2014-09-02 09:52:38 -05:00
Nate Jensen
ef99d43451 Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595

Former-commit-id: d326ee1a73a852e5534e76bf2148afd7646adb7e
2014-09-02 09:50:08 -05:00
Richard Peter
40917b6118 Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: f7aa38e6092e59e314fedad22829eed9e5c22ad2
2014-09-02 09:23:58 -05:00
Mark Peters
045746ec21 Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473

Former-commit-id: 8099cbe2359334d6718761046a1475fca687af35
2014-08-29 16:17:22 -05:00
Mark Peters
91f2b365a1 Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9

Former-commit-id: a0864eff6efa679cdc0f58cd408102e32145f22c
2014-08-29 15:05:29 -05:00
Ron Anderson
de490ea582 Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.

Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062

Former-commit-id: a1896437f432bcb360365d28a0ee7377cec565af
2014-08-29 12:04:52 -05:00
Nate Jensen
c60dfb889c Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 3482282527df3ffd13c93d1a5d63d52ce79f8b2b
2014-08-29 11:16:16 -05:00
Steve Harris
c49eabbb45 Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: 94468f09bd626bd2ff26e7312ceede154f427664
2014-08-29 11:05:34 -05:00
Ron Anderson
9f37d7914a Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f

Former-commit-id: b1c067fe33d1fe09f89e981b03ef178bcc3a5f93
2014-08-29 10:45:54 -05:00
Steve Harris
5d58625abc Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	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/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
2014-08-29 10:17:52 -05:00
Ron Anderson
2b88ade974 Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34

Former-commit-id: e7acedd733e4f1acc89f6287fe74ff116376a4ca
2014-08-28 10:43:54 -05:00
Nate Jensen
8536f6681a Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 2bac6ff5e600218f61343a7dc0f540c27f291924
2014-08-27 16:27:40 -05:00
Roger Ferrel
9154ef60bb Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 474e07b299246aee4e6b214226c176c4a10aa866
2014-08-27 15:06:52 -05:00
Brian.Dyke
aa83bf804f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Nate Jensen
7acf4a04b2 Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: bdc7d4cb7873651a4b59e0b6af9bb9dae931de77
2014-08-27 09:54:49 -05:00
Nate Jensen
1ad37de1ef Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05
2014-08-27 09:54:24 -05:00
Brian Clements
f871058f67 Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01

Former-commit-id: dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3
2014-08-26 17:22:20 -05:00
Nate Jensen
fdc4cc60b9 Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44

Former-commit-id: 263452a82aef4756492fe02156525137b5ca09ff
2014-08-26 16:45:00 -05:00
Steve Harris
038b284066 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 03ba5101d6f277b55173f72c2a63869e9dc31c3f
2014-08-26 16:25:21 -05:00
Nate Jensen
b92d94d19d Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: d5db15de813a41767a1a10b0bfa07eb88c8dff6e
2014-08-26 13:42:13 -05:00
Brian.Dyke
b3767167c7 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2382e17fb6b947be89649da7c25698dc5baf5bf4
2014-08-26 13:31:34 -04:00
Ron Anderson
73fec5c36a Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 2cfb44f69025ba06e85a44e481bac1f88b851834
2014-08-25 16:18:58 -05:00
Nate Jensen
1a48a8190f Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 5a0ccfe4b1effb0946e6d542c492bff45d6a904b
2014-08-25 14:14:47 -05:00
Mark Peters
6634a2df01 Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e

Former-commit-id: 449f167ce1c30a595b4b673fc4d71658500e844d
2014-08-25 13:50:27 -05:00
Ron Anderson
606e2b210c Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0

Former-commit-id: 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1
2014-08-25 12:39:58 -05:00
Roger Ferrel
d0779ef059 Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790

Former-commit-id: f16a8ff2c51c392957e13ef63423abe9f99b3301
2014-08-25 07:59:26 -05:00
Brian.Dyke
dd9d7133d9 Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 65e2373d13c7d5b33d579b87d98a8265252ea391
2014-08-22 14:16:22 -04:00
Steve Harris
9cda8755c6 Omaha #3368 - removing cave/hydro
Former-commit-id: a232972763ef0dcbccd5d83b3841498f1b77b7aa
2014-08-22 13:08:32 -05:00
Greg Armendariz
b951f0e4eb Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
Former-commit-id: 24376606c4974e3b22f120dac1c81a1752771ab1
2014-08-22 08:06:13 -05:00
Steve Harris
28e88dfe7e Omaha #3368 - Move ohd plugin to new repository
Former-commit-id: 56dfed379b0e41c435a3226c3f02b9bc5232b4fd
2014-08-21 11:04:08 -05:00
Qinglu.Lin
2157a4aa3b ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b

Former-commit-id: b8a4741b2519e8c02a1b80ba8544be9b1c26d35c
2014-08-21 10:43:22 -04:00
Ron Anderson
bb124e7fa2 Omaha #1664 Fixed invalid thread access in several GFE dialogs
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3

Former-commit-id: 93aa457f4918cd16edd21422819cda12af26250f
2014-08-21 09:25:14 -05:00
David Friedman
6a7638ddae ASM #16703 - Errors issuing Marine Products over areas under a Watch
Change-Id: Idd28b86771295c90cec3c9b3e7e2dfc96c84ff4f

Former-commit-id: 7027ff533991251f64f2e5a0deb31e2945cdde5f
2014-08-20 14:13:32 +00:00
Slav Korolev
a779c786f1 Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: aee044437492438381db98cc6fd3a917f6c05659
2014-08-19 10:12:36 -05:00
Brian Clements
fc2e7f52b9 Issue #3542 fixed lightning count clipping issue
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: 937c656ba2a9fc98bfa5655a5020d470f83b898f
2014-08-19 09:00:58 -05:00
Nate Jensen
7c4a57e518 Merge "Issue #3497 refactored syntax check to prevent infinite loop possibility and apply some sanity" into omaha_14.2.4
Former-commit-id: fe105be09b018efb625194f692ae9686a898981e
2014-08-19 08:37:47 -05:00