Commit graph

11446 commits

Author SHA1 Message Date
Ron Anderson
dc55dde5d5 Omaha #5513 Fix NPE when AlarmAlertDlg is opened the second time.
Change-Id: Iba0cfd1ed74d4ab045064abdf4768bd0fa3f1db4

Former-commit-id: 430701c960d301cfae54b65dc9c6a0187352a760
2016-05-31 17:01:18 -05:00
Shawn.Hooper
0960d09481 Merge branch 'master_16.1.2p3_for_merges' into master_16.2.1-p1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Change-Id: I944b2f48026df080e494ab9104bfd63e30c0c9ef

Former-commit-id: f8ebc36d5e1edc7f625bfafc3f8e9d8a7d13303d
2016-05-31 13:13:50 -04:00
Melissa Porricel
dce51b58ea ASM #16930 - Spell checker should flag inappropriate words
Change-Id: Ib3c2fe784591fdaaa9eb57028e7fd435a72994bd
(cherry picked from commit b99defbc67fe2378e45260d71968f22e0049ec4b)

Former-commit-id: e38e96ec16cbc6e6bf33f963696252ef3461c09d
2016-05-31 13:12:43 -04:00
David Friedman
0daedab4cc ASM #18789 - WarnGen: it take a long time to create SPS at LI (additional changes)
Change-Id: Iba218a3d6a6fbd53d7c10f6f5a565cd25ccc50fa
(cherry picked from commit ac96afb33ce063940e23a0e5180e93a8b1bc60fd)

Former-commit-id: a0ad4e409c1a8822f95f61bd4c0bc1aa4dd07e70
2016-05-31 13:12:42 -04:00
David Friedman
cf71c7d648 ASM #18789 - WarnGen: it take a long time to create SPS at LIX
Change-Id: I6fa7bae740c2e369c4505a89dc1145742c38ca2a
(cherry picked from commit 533b14a4270411af6ddacb81914932d33b3191c1)

Former-commit-id: 919da1cff1b911a7de4224710bb38ad8017655a0
2016-05-31 13:12:42 -04:00
Mark Ruebens
a5e6a56f97 Merge "ASM #18971 - caveUtil.sh may attempt to create a temporary Eclipse configuration directory in a deleted directory" into asm_16.2.2
Former-commit-id: 349b7dda2cc10c24c00e1edf99b715b722278154
2016-05-27 11:39:52 -05:00
David Friedman
5f5d31f6ba ASM #18971 - caveUtil.sh may attempt to create a temporary Eclipse configuration directory in a deleted directory
Change-Id: I3ad32f649bfb63d97861cc8423dce590700a2857

Former-commit-id: 676bce601f6b694de6da0584c6eecd4ea00990ae
2016-05-27 16:26:46 +00:00
Mark Ruebens
fd2e32ff78 Merge "ASM #19012 fixed colorscale manager issue" into asm_16.2.2
Former-commit-id: ce261fb49839cce017facc4f39a46856f1ce696b
2016-05-27 11:03:34 -05:00
Loubna.Bousaidi
598ab33215 ASM #19012 fixed colorscale manager issue
Change-Id: Ifa4cfd6b380cb1cf7dc8410a168d9e495c843ef1

Former-commit-id: 3b3b48303647927fcee67ee873271bc15f406488
2016-05-27 14:44:00 +00:00
Rici.Yu
ac4b06261e ASM #19014 - Fix data rounding causing Td to be greater than T
Change-Id: Id021a4ddc4959423e9e6184d6707b0363612351d

Former-commit-id: cf774dbaa31261ca96eb643bd9b615448d2e19ab
2016-05-27 08:57:26 -04:00
Shawn.Hooper
5daf30f6ad Merge remote-tracking branch 'vlab/asdt_16.2.1' into master_16.2.1-p1
Former-commit-id: 9a179b661b7d4a7dc9b0ef282b07f5a750c635bc
2016-05-26 16:23:51 -04:00
Ron Anderson
5b059253ce Omaha #5653 Handle empty printer list, code cleanup.
Change-Id: I41b8353524c54ac91947a994370616fb00ca9b26

Former-commit-id: 9ed56de279b7d19f6a18cde083da3c29fab0cb8b
2016-05-25 13:21:55 -05:00
Ron Anderson
3bd561ac2e Omaha #5653 Workaround printer/driver issue with landscape mode printing
Change-Id: I8ced511c0404b6b2a9c3249929829d3a8198d4d0

Former-commit-id: 473094783aad56e84bf6e018810cdca456e0518b
2016-05-24 16:32:19 -05:00
Steve Harris
cf8756b433 Merge tag 'OB_16.2.2-8' into omaha_16.2.2
16.2.2-8


Former-commit-id: 902012b504a1894a43e83963f52303fa56d6d5fe
2016-05-24 12:52:13 -05:00
Shawn.Hooper
1cd979a20b Merge remote-tracking branch 'asm/asm_16.2.1-p1' into master_16.2.1-p1
Former-commit-id: ea3edd5c72b95b1c3da59ef72e4ff8b7daf1ca3b
2016-05-24 13:13:27 -04:00
Melissa Porricel
f6cb19c4cd ASM #19004 - Updates for GFS20-AK and GFS20-PAC
Change-Id: I26e66874cbbd26428a592457570e699695c0250d

Former-commit-id: 688b4348bdb8233d5d9b46fdb68f71556b0aa3e1
2016-05-24 11:00:39 -04:00
Shawn.Hooper
9b7c93ff1b Merge remote-tracking branch 'vlab/asdt_16.2.2' into master_16.2.2
Former-commit-id: aac71839f2102c799f34ad2f53c1a589deefbad2
2016-05-23 14:37:36 -04:00
Shawn.Hooper
9726a3c191 Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Former-commit-id: ad309e585a084f274b68abfa72a20d048a00fc4c
2016-05-23 13:13:20 -04:00
Kenneth Sperow
1d0a9fe45a Merge remote-tracking branch 'origin/master_16.2.2' into asdt_16.2.2
Former-commit-id: e91bac2a471ffb3f14782d60d1b4202847f8511f
2016-05-23 10:06:24 -07:00
Shawn.Hooper
3a03a83975 Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: 90719ee2df7532ed6ab3172cf2345b03bced5ef4
2016-05-23 12:57:15 -04:00
Richard Peter
c1ec2e4406 Merge "Omaha #5664 Close netcdf files in pointset decoder." into omaha_16.2.2
Former-commit-id: 6a0b24badbdfae8a617e5bb35fcb24742c59d7f5
2016-05-20 11:20:05 -05:00
Ben Steffensmeier
a85a4f6a8c Omaha #5664 Close netcdf files in pointset decoder.
Former-commit-id: 1b82fbbdf5c93fe4fa7984487a02a06f31e9dcc2
2016-05-20 10:50:32 -05:00
Richard Peter
aae8e6ddfa Merge "Omaha #5668 Move deltaScripts from TO56 to correct directory" into omaha_16.2.2
Former-commit-id: a87d35c916a81bde7000a4e314b0710d931330f6
2016-05-20 09:34:17 -05:00
Steve Harris
89e25dd014 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
	cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 30e9ffce1a90bd85f5b310944b309188447439ce
2016-05-19 22:07:52 -05:00
Ron Anderson
92994bc798 Omaha #5668 Move deltaScripts from TO56 to correct directory
Change-Id: I921297e0a66b9ea4732ceb399a2410e687274569

Former-commit-id: c59e6a957d9adc2d03f3c0025ee1efba839cb0f7
2016-05-19 18:21:34 -05:00
Sean.Webb
57bbecadbb ASM #19025 - Added inappropriateWords.txt to deltascript area
Change-Id: I57de1a9173989f27ce7bbe9c89dcc85df4757f0f

Former-commit-id: 0c967a38ae90b26222409284f12582a3c6b25b97
2016-05-19 11:06:47 -04:00
Sean.Webb
7ded8c476b ASM #19025 - Added bad words and delta script to update overrides
Change-Id: Ib751a128fc6fb8cfc1f620a7de9bdb6bd4c0ad95

Former-commit-id: 5afa3ca48d49a253f1ec9e037b9588bab0881bbf
2016-05-19 10:54:19 -04:00
Sean.Webb
275cc1926d ASM #18987 - Updates to EWW template
Change-Id: I1308c1ccd89a14ce076017f54d8090b54014c490

Former-commit-id: 1db43b17f6654231d37e0281ae7a627df863a27e
2016-05-18 04:44:57 -04:00
Steve Harris
e7a171b923 Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 16a1f86553620541fa175e10d9b7734e13fe98c7
2016-05-17 22:10:58 -05:00
David Gillingham
45f39087dc Omaha #5483 - Fix hi-dpi layout issues in hydro Point Data Tabular Display dialog.
Change-Id: I902f065eda4f6f5b494438dff044a387b2831d3f

Former-commit-id: 9588b5a6d7389f4cd131c29da9841634c11344e7
2016-05-17 10:51:12 -05:00
Zhidong.Hao
b93e94bf71 ASM #19009 FFMP: DPR underestimating basin rain averages
Change-Id: Ib90ce4a2c3f535f5ce72595abb08996c0c77aedf

Former-commit-id: f6cc23c9e2cfd067ada3832979e342be1cac0292
2016-05-17 09:37:50 -04:00
Bryan Kowal
522df34bca Merge "Omaha #5483 - fix Hydro GUI sizing issues." into omaha_16.2.1-lx
Former-commit-id: 3e8ba66a6ae1342be9abc52e478b63a732d6043c
2016-05-16 18:24:28 -05:00
Wen Kwock
6df6f91580 VLab Issue #18745 - DR17787 fix conflict; fixes #18745. Includes additions for MRMS from Darrel.
Change-Id: I205178d8d6d0740d7484bf81e2270b2d59c5d0e0

Former-commit-id: f51c83713e0d07ecb719260cd1a6f965722da3b3
2016-05-16 16:17:23 -07:00
David Lovely
c8f420f39c Omaha #5586 Added NASA SPoRT as an optional repo
Change-Id: Ieddc4213dcff264bb5c87505fb512a337a9e4e6f

Former-commit-id: 5e2268423c11f5288925310ddbb5de329d8e6c5f
2016-05-16 14:50:37 -05:00
Bryan Kowal
c7c4ef3f31 Omaha #5483 - fix Hydro GUI sizing issues.
Change-Id: Ibe0ead7fa2b24b80724b4dcb38ab8b0bc25decd6

Former-commit-id: 9c4bcf5d9896c5e3334ccd419ee929f56c06b0ec
2016-05-16 14:49:04 -05:00
Steve Harris
d0ec543b42 Merge "Omaha #5586 - moving NASA SPoRT plugins to AWIPS2_NASA_SPoRT repository" into omaha_16.2.2
Former-commit-id: 7333c85fc9ce61e33a729b4f70d160c6346b2c5f
2016-05-16 14:23:57 -05:00
David Lovely
51b764d689 Omaha #5586 Removed NASA SPoRT features
Former-commit-id: 32dda5d366a994590c7f731a378bfa2e8a9e8d14
2016-05-16 14:03:18 -05:00
Ron Anderson
5a7b2fb067 Omaha #5483 Fix GUI sizing issues in Station Legend dialog
Change-Id: I981a6fcc3b0787689aaa2565c0959e34a3ff42c8

Former-commit-id: 38f04280e141ac750f84c4c34b4e0d6dffbb2370
2016-05-16 13:57:01 -05:00
Ron Anderson
794b8a3d3c Merge "Omaha #5653 Fix scaling of D2D screen prints" into omaha_16.2.1-lx
Former-commit-id: b61c2ab198a61ebb1b61ca2f9a0788af67614ba7
2016-05-16 11:39:21 -05:00
Ron Anderson
8fdadf1a52 Merge "Omaha #5483 - fix Hydro GUI sizing issues." into omaha_16.2.1-lx
Former-commit-id: 2a3d165e8a82452d6b39832cda3ced3dcabab9ba
2016-05-13 15:46:39 -05:00
Shawn.Hooper
ceb9742387 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1-p1
Former-commit-id: af6f5e78ced8e265063fd184af88886fe58bd4fe
2016-05-13 16:23:31 -04:00
Ron Anderson
2d47b1f22f Omaha #5653 Fix scaling of D2D screen prints
Change-Id: I17bf5f2d74bcfa8b3df989945252ac6782b5dce7

Former-commit-id: d24dab98236c41de9b26352bea1c2881118e1c55
2016-05-13 14:46:37 -05:00
Mark Ruebens
99b1b62c99 Merge changes I7e4d3cca,Id75ad2d2 into asm_16.2.1-p1
* changes:
  ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
  ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation


Former-commit-id: 7ecb4d6a9904cf2f0552454a9f3fdf991d3ec2bb
2016-05-13 14:28:21 -05:00
Mark Ruebens
236d191804 Merge "ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm" into asm_16.2.1-p1
Former-commit-id: 54b6eff2eddd813b0f08d6344bb0aef6fa6683dd
2016-05-13 13:03:11 -05:00
Ron Anderson
1c0252b602 Merge "Omaha #5516 Cleaned up GUI code for FFMP Table" into omaha_16.2.1-lx
Former-commit-id: 988f22f8ea975f35f865339894de514cd1e3ac32
2016-05-13 12:31:53 -05:00
Shawn.Hooper
cb2a92c16d Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
Former-commit-id: 621247965d7e00d548804e7f2871739b2a6867f6
2016-05-13 13:16:13 -04:00
Shawn.Hooper
cb056721af Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: ae99c4e7b743ff3ae10a73796a14b72426598401
2016-05-13 13:15:53 -04:00
Shawn.Hooper
c58c624779 ASM #18987 - Updates to Extreme Wind Warning Followup Template
Change-Id: I2a8598e6af722a5fbed353f6c8d41c241ad6c45f

Former-commit-id: 7dd216cc9a264147189806ca3549700acb0d5c0b
2016-05-13 12:51:30 -04:00
Penghai Wang
2519dfda38 VLab Issue #18616 - DR18984 enable to load all levels of gfeParamInfo.xml; fixes #18616
Change-Id: If56ee04aa285a9e9d89b31ec73319070c9b45e1f

Former-commit-id: f026d9b5539377db251ce7ba1795bad9d7d686c5
2016-05-13 16:41:05 +00:00
Shawn.Hooper
3aea06ff70 ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
Change-Id: I7e4d3cca6fa3f87c90b5fcec1aee53b97ccfd644

Former-commit-id: b3417552085340863cf193e7555a581c17ec6332
2016-05-13 11:30:20 -04:00