Brian.Dyke
7b7ef56b04
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
...
Former-commit-id: a77577595da1e2dcc8057c5a8b8643a612780339
2014-09-04 15:59:00 -04:00
Nate Jensen
51d910af00
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
Brian.Dyke
e762271240
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: ad120a9357402fbdedb350cabe88d2becf5d7361
2014-09-04 14:18:34 -04:00
Qinglu.Lin
8c28597210
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 33adaf353c6a4b7dc418dc86428257dae260c4c5
2014-09-04 14:09:24 -04:00
Nate Jensen
2cfbfc1dc4
Issue #3574 Properly dispose radar graphics graphics objects.
...
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782
2014-09-04 10:10:37 -05:00
Baoyu Yin
9e110936e8
VLab Issue #4608 - AWIPS2_DR_16259 Minor Typo in Volume Menu of D2D 4-PanelFamilies ; fixes #4608
...
Change-Id: I73a3f5a441e33dffe3dc7f3962c3fceec930ce3a
Former-commit-id: cb4e2e652ba3763725b8ec7e6d528748d2472a6b
2014-09-04 08:23:53 -04:00
Baoyu Yin
fd229c716d
VLab Issue #4567 - AWIPS2_DR_16933: Text Script Editor Edit Menu Delete Line Option; fixes #4567
...
Change-Id: I10e1dbdd6352adcfa39ae8980230a95afdc8cec1
Former-commit-id: d9f69c85c6432a937f70c16053f45d5214ce5147
2014-09-04 07:53:38 -04:00
Nate Jensen
20251fc3e3
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
Steve Harris
0e869fa6c1
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
...
Former-commit-id: 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4
2014-09-03 15:22:00 -05:00
Nate Jensen
c0dab26b92
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
4b5d5ab6cc
Omaha #3356 remove unnecessary dependency
...
Change-Id: I59503f01e8c7ec451c7dcb725bf9fecd0209fba2
Former-commit-id: c60ca3a16e348216c582f30bc95d8d35ef81e312
2014-09-03 10:53:30 -05:00
Nate Jensen
8e74892cd6
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
06b98bb48a
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
1d2144e840
Omaha #3390 Remove references to deprecated API.
...
Former-commit-id: ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3
2014-09-02 15:39:45 -05:00
Brian.Dyke
fd8ad016ef
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
...
Former-commit-id: bc9f03426304e3bb194fbf7f356d8dd3816cd836
2014-09-02 16:32:54 -04:00
Brian.Dyke
f0875e724f
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 40efe51cafd5589ef0a640041ad0539e454b6f8d
2014-09-02 16:30:51 -04:00
Brian.Dyke
368f80f220
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: f9daf7d6e906904e96438fabc510e24ff66536d4
2014-09-02 15:09:06 -04:00
Qinglu.Lin
2374673f8d
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: 59890eef397f3282ef26f259ca85ffea3db7b710
2014-09-02 14:37:19 -04:00
Ron Anderson
46c62a1db6
Issue #3572 Fixed getNumpy errors for Grid2DFloat
...
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: e2ecb91569c2f622d45f7301c1eb4e058a2ab641
2014-09-02 12:21:42 -05:00
Ron Anderson
6a5d4acf7c
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
5247f4833f
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
2c209af1fa
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
c4333e030c
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
4395ab6f11
Omaha #3356 fix cave startup
...
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595
Former-commit-id: d326ee1a73a852e5534e76bf2148afd7646adb7e
2014-09-02 09:50:08 -05:00
Richard Peter
6f66071eca
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
Steve Harris
3b6a003884
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
...
Former-commit-id: 09b94266f1f3aeaaa7fcf622487d751097d271a4
2014-09-02 08:12:49 -05:00
Mark Peters
e35a7451c6
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
Ben Steffensmeier
22f93b6905
Issue #3543 Fix gl datamapping of data with NaN conversions.
...
Former-commit-id: bc12be9bb6e8c7f63550602f51bca3448c21d4c6
2014-08-29 15:08:03 -05:00
Mark Peters
097ce54969
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
Kiran.Shrestha
a285439c08
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
...
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: 1681bea10870df58b3f2cc0d0a59f21c596e9e95
2014-08-29 13:50:55 -04:00
Ron Anderson
8583386e5f
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
16191b10ab
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
aedf89c00b
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
...
Former-commit-id: 94468f09bd626bd2ff26e7312ceede154f427664
2014-08-29 11:05:34 -05:00
Ron Anderson
bd52b5a924
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
793064063b
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
Brian.Dyke
6f3d0508e4
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: f34bc4f81eb5ac92ef306f73f8c34243d3f78e31
2014-08-29 10:19:02 -04:00
Brian.Dyke
37c926973c
Merge branch 'master_14.2.4' into asm_14.2.4
...
Former-commit-id: cff9bfd2697a73ccc18642d8dc057b6a27aa2991
2014-08-29 10:07:14 -04:00
Brian Clements
b352bd3944
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
...
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: b3482522860408c2d052261e845899cf73c2ce96
2014-08-29 08:55:58 -05:00
Juliya Dynina
169dc0ba43
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
...
Former-commit-id: bb260c4003b477ca51cf5fd9c8d54275af906772
2014-08-28 15:52:11 -05:00
Ana Rivera
160dabc4d1
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
...
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: 2df117a7aec644e6964da6c36326ab3b29b9f378
2014-08-28 18:38:26 +00:00
Roger Ferrel
6f8c6d6aa1
Issue #3553 - Force redisplay of data set table after all labels are generated.
...
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: bcc9b0a6352151dfdf3ba75063bb87308cb162b4
2014-08-28 13:10:11 -05:00
David Friedman
de6e79f9e3
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
...
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: aca832a81bc18d954eadb51755ce04597cd264df
2014-08-28 18:08:23 +00:00
Daniel.Huffman
c89a7169b0
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
...
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f
2014-08-28 17:20:30 +00:00
steve.naples
1856a05319
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
...
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: 2e8fb864f410b9b08ccc6de6c0d75666931da3a2
2014-08-28 16:08:17 +00:00
Ron Anderson
bb1e80b844
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
David Friedman
a2dfe8e8f6
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: 6bfa1d6662b00925814be7126592bbe340651649
2014-08-28 15:43:32 +00:00
Brian.Dyke
47ae6015e5
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: 3909fa46a4efffabb09303f139bc36accc064a6d
2014-08-28 11:39:48 -04:00
Nate Jensen
2710aed225
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
fa42c4069a
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
e654318431
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
