Slav Korolev
|
47fcfda6da
|
Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2
Former-commit-id: 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 5e4bbc03a4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]]
Former-commit-id: af101861e4
Former-commit-id: d9710603e7 [formerly fd46994bb9] [formerly d7de73f56f69ac57bd4c037b1331da78ad5eafa0 [formerly a6241ff4d8]]
Former-commit-id: ea094f0bb19456530bb0dfb6f5a0181129fb8e44 [formerly 7b66b5258d]
Former-commit-id: 627c3987ea
|
2012-12-06 12:42:06 -05:00 |
|
Ben Steffensmeier
|
d1cdfbec7d
|
Issue #189 clean up unneeded references to grib.
Former-commit-id: 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 72792fd1b8 [formerly 9dd5c8d545] [formerly 7226decbe2] [formerly 7e1463f328 [formerly 7226decbe2 [formerly b25e86c8f369297b8e21efe7cdc0a9874c0cc470]]]]
Former-commit-id: 7e1463f328
Former-commit-id: 3c47e2bc6f [formerly f0c1fcae31] [formerly 623f130b6c25d38fa4d4e0a2c769c9011f96f103 [formerly 9b1b658f42]]
Former-commit-id: 81c76cfda13aded66ad0c485bb85ba568420a3f6 [formerly 08df92cccd]
Former-commit-id: 63f751fa7b
|
2012-11-19 13:33:02 -06:00 |
|
Brad Gonzales
|
e4e96327f0
|
Issue #1158 Changed the scheduled and alerted alarm containers in SCANAlarmAlertManager to be sychronized. Changed the alarm button and alarm in SCANCellTableDlg to show and alarm only when the current table has alarms. Turn off alarms if the threshold has changed. Also a fix for ScanResource to initialize the ScanDrawer only after it has initialized the GeodeticCalculator.
Former-commit-id: 0750f76993 [formerly 49f61f42f1] [formerly 02ca1776b4] [formerly 0750f76993 [formerly 49f61f42f1] [formerly 02ca1776b4] [formerly 1ed32bdefc [formerly 02ca1776b4 [formerly e1f97dfdf69c0cf625555372e8855d85967c4b2a]]]]
Former-commit-id: 1ed32bdefc
Former-commit-id: 9575ce37d2 [formerly c34cdda42f] [formerly af9bbfb5aa58b854fab891b292d963e9ec66cad2 [formerly 88d9115db9]]
Former-commit-id: d587191e75e38d5c93e25ec02a38f42309887bb7 [formerly 10ddb22854]
Former-commit-id: 3fab94cf35
|
2012-09-13 14:20:23 -05:00 |
|
root
|
73466bae44
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
2f6ae50479
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: fe7ac96625 [formerly 53d2822329] [formerly 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]]
Former-commit-id: 3940ab38fea505f445ec4019600081324e15e68d [formerly 7ee04eb560]
Former-commit-id: d040b14742
|
2012-05-09 13:19:47 -05:00 |
|
David Gillingham
|
d189b66b1f
|
Issue #562: Rename QPFRecord getters and setters to match Java-naming
conventions, correct bugs in other classes found during test.
Change-Id: I7f490793678741ffa41769a63371e06d27840bdb
Former-commit-id: 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 034cab5000 [formerly 6497272c1d] [formerly c28bfaddee] [formerly 292374ce21 [formerly c28bfaddee [formerly fe6ec52b4cf64d410f3de609b06cf9666a5936bc]]]]
Former-commit-id: 292374ce21
Former-commit-id: eeb836f5eb [formerly 1107eac65d] [formerly 4ffd35492e1f4e3a22ff89cb2e9d2d09bf68492e [formerly 6f40ba77f1]]
Former-commit-id: e167e02e805072fdf1b2f36d3706605647061458 [formerly 01f74fa2b5]
Former-commit-id: 64df9d3b46
|
2012-04-27 12:43:04 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
80108c0af9
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
|
2012-04-10 12:50:03 -05:00 |
|
Steve Harris
|
9340618732
|
12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
31c739aec3
|
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 229fa2944d [formerly 6d2af585b1] [formerly 5bbf80a384] [formerly 10dc140747 [formerly 5bbf80a384 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]]
Former-commit-id: 10dc140747
Former-commit-id: 4d58cdca1b [formerly 7fc8cf3d94] [formerly 80cb0b251d26c0d96f2c7ee6601e3e0f30708bf4 [formerly 7bdde9f690]]
Former-commit-id: 3641f7427bca19a3448d6e5ab052df768969a1af [formerly a97a9f80c9]
Former-commit-id: 749ee2f4f4
|
2012-03-12 13:10:34 -05:00 |
|
Steve Harris
|
8c9e581f41
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
|
2012-02-17 10:55:02 -06:00 |
|
mpduff
|
8f6196d8c4
|
Issue #16 - data/manual now uses subdirectories
Change-Id: I19786d4a39b2f7363b9eccd3ef00cd2ddf7d46fb
Former-commit-id: ba3656aebd [formerly 6b70dd6462] [formerly 59c8cbf1f3] [formerly ba3656aebd [formerly 6b70dd6462] [formerly 59c8cbf1f3] [formerly 24efc2ee93 [formerly 59c8cbf1f3 [formerly 3619411519db0fe5df90e47ca478f083931817ec]]]]
Former-commit-id: 24efc2ee93
Former-commit-id: c0bb08e04d [formerly b1887fbdb8] [formerly 029cab0fd8e2390b796b6d2ef9a36da598fd8654 [formerly 5deccb8bf5]]
Former-commit-id: a98caac945ef546b7e6280b735a43406d0b2b8ec [formerly e66ce50272]
Former-commit-id: 38d3969023
|
2012-01-24 12:27:11 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|