Lee Venable
aa4b1f4970
Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
...
Former-commit-id: 0540d84e4e
[formerly e96cd422716fc6da7c0007b58fa75659c7600ad7]
Former-commit-id: 40f11cfba5
2012-11-15 17:43:31 -06:00
Max Schenkelberg
f1866b2e49
Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
...
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737
Former-commit-id: 655f54b098
[formerly 4648ab539b37a0608ab7ebab5080317bbf618504]
Former-commit-id: f540f65fd7
2012-11-15 16:21:42 -06:00
Roger Ferrel
05f32527bd
Issue #1298 Changes for non-blocking GhgAlertDlg.
...
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d
Former-commit-id: 800c1a6908
[formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]
Former-commit-id: c0554d9686
2012-11-15 15:51:46 -06:00
Roger Ferrel
2206167b00
Issue #1298 Changes for non-blocking GhgMonitorDlg.
...
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3
Former-commit-id: dc82ad820b
[formerly 782113272c208a32e6165c02404138fcaa79d523]
Former-commit-id: 109dea21e1
2012-11-15 14:37:29 -06:00
Roger Ferrel
fdfcb2ebea
Issue #1298 Changes for non-blocking SelectionDlg.
...
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b
Former-commit-id: 00693d83bb
[formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]
Former-commit-id: 59181213a0
2012-11-15 12:55:49 -06:00
Roger Ferrel
d6c5839e0e
Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
...
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455
Former-commit-id: a6fdc7b580
[formerly dd80807a0469e7c677f8e0d214fcdec715c67518]
Former-commit-id: acf1881cb7
2012-11-14 16:33:27 -06:00
Max Schenkelberg
2e20c3e799
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: dcde9e8951
[formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]
Former-commit-id: 28e61c8285
2012-11-14 16:19:37 -06:00
Nate Jensen
6210f94be1
Merge "Issue #189 fix contour subgridding for worldwide grids" into development
...
Former-commit-id: 5055164f55
[formerly 553b56aa362b452110a7f5a4f76aec9640d13599]
Former-commit-id: 340f8e1fa8
2012-11-14 16:09:51 -06:00
Lee Venable
7ed335793f
Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
...
Former-commit-id: 695cf85335
[formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]
Former-commit-id: 6134e5d3f7
2012-11-14 16:06:02 -06:00
Lee Venable
bbba9b1b29
Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
...
Former-commit-id: 8fa3d794fd
[formerly eceb7bed3794368ebb0cd57e466e7beaee88a19d]
Former-commit-id: edfab7e56f
2012-11-14 16:05:20 -06:00
Roger Ferrel
d069f186e1
Issue #1298 Changes for non-blocking DisplayAttributesDialog.
...
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d
Former-commit-id: 7ca75756ae
[formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]
Former-commit-id: 212045c1a6
2012-11-14 14:56:42 -06:00
Dustin Johnson
e25b7c312b
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: bff32bbe58
[formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]
Former-commit-id: 0d1d663f41
2012-11-14 14:41:57 -06:00
Roger Ferrel
89653eb5e1
Issue #1298 Changes for non-blocking TEWxSetValueDialog.
...
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b
Former-commit-id: 7f22145bf2
[formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]
Former-commit-id: dd8f8a9fa7
2012-11-14 14:20:40 -06:00
Steve Harris
628ca9e5c6
12.12.1-4 baseline
...
Former-commit-id: 85130eb611
[formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 57578da521
2012-11-14 14:19:20 -06:00
Roger Ferrel
3f0dc83f89
Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
...
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8
Former-commit-id: e267248b57
[formerly 5c0eef28a67b874f184fd391d9220957030e43c7]
Former-commit-id: 2331b8e1f5
2012-11-14 14:02:01 -06:00
Lee Venable
09591687a9
Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
...
Former-commit-id: e755889643
[formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]
Former-commit-id: e9ae25e781
2012-11-14 13:30:42 -06:00
Roger Ferrel
950300e16d
Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
...
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072
Former-commit-id: d16a448e05
[formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]
Former-commit-id: 590eca2cba
2012-11-14 12:04:18 -06:00
Ben Steffensmeier
76996706f4
Issue #189 fix contour subgridding for worldwide grids
...
Former-commit-id: 3ee95cff21
[formerly e0fb632cc7e0d089436b64a3f2bc6977a0487708]
Former-commit-id: 929a785e1b
2012-11-14 11:38:25 -06:00
Roger Ferrel
af0ad0433b
Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
...
Changes from reviewer comments.
Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac
Former-commit-id: 049ecefe1d
[formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]
Former-commit-id: b32480ed08
2012-11-14 11:36:52 -06:00
Steve Harris
c8cac52915
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]
Former-commit-id: 00f3d51546
2012-11-13 17:28:50 -06:00
Steve Harris
2797cbcdd0
12.12.1-3 baseline
...
Former-commit-id: c999505fba
[formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: b3b5e6d28f
2012-11-13 17:27:04 -06:00
Steve Harris
df89fe9bed
12.12.1-2 baseline
...
Former-commit-id: a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]
Former-commit-id: 6868eb9b23
2012-11-13 17:14:24 -06:00
Lee Venable
282e8858da
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: 989d5dc5e4
[formerly 7f22292e89e05b881466efd1d81ef851c454246a]
Former-commit-id: dbdfda1d04
2012-11-13 16:02:05 -06:00
Steve Harris
1e0ad343d6
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: 63b0f18a89
[formerly b0c071ca9877eb73e312a530d6abb94563cbc980]
Former-commit-id: 5c23f057b3
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
60f78c22e3
Merge branch 'ss_builds'(12.12.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]
Former-commit-id: e8090e654b
2012-11-13 16:00:19 -06:00
Roger Ferrel
29eb436b19
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: 1d5bd95866
[formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]
Former-commit-id: dceb2cde5d
2012-11-13 15:53:03 -06:00
Lee Venable
32f088d986
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: c1e46f52ca
[formerly 795564ae453a7afb423980679c3719a7c453aa74]
Former-commit-id: 9d149bef29
2012-11-13 15:35:13 -06:00
Roger Ferrel
d646f32d6e
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 1e8dfdc857
[formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]
Former-commit-id: b421a30116
2012-11-13 13:20:28 -06:00
Roger Ferrel
8e85e1c8df
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 22f8bc10f0
[formerly 4da71d30d62eeeee3546c3019850e77cab757c78]
Former-commit-id: 4c3af2a258
2012-11-13 12:55:33 -06:00
Roger Ferrel
30c70cc181
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: 5ce67ffd9e
[formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]
Former-commit-id: ae52206cc7
2012-11-13 09:49:16 -06:00
Nate Jensen
7baf10fc53
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: 8a07ba3c11
[formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]
Former-commit-id: e7045022ad
2012-11-13 09:28:05 -06:00
Nate Jensen
cf8fd9f731
Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
...
Former-commit-id: 8a1f3a10a4
[formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]
Former-commit-id: e51d86ce3a
2012-11-12 17:16:07 -06:00
Lee Venable
fb4b76b003
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: a576274c3c
[formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]
Former-commit-id: d4276e6474
2012-11-12 16:58:17 -06:00
Max Schenkelberg
c4e5092f94
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: d1099addc6
[formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]
Former-commit-id: 00822a4f39
2012-11-12 16:46:21 -06:00
Roger Ferrel
de21a3f2ef
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 66606f88de
[formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]
Former-commit-id: e982c0f43a
2012-11-12 16:27:08 -06:00
Roger Ferrel
e7cd99ff0d
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 6445081aa9
[formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]
Former-commit-id: 76109f3bf7
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
220f41ec4c
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
...
Former-commit-id: 7d3f479031
[formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]
Former-commit-id: b5b472dee1
2012-11-12 15:15:49 -06:00
Roger Ferrel
b11413b7f0
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 9c9a068908
[formerly b24c130aa9c612822dda92a9820912b0cd7bc852]
Former-commit-id: f48474fc82
2012-11-12 14:22:02 -06:00
Lee Venable
ded0bfb92f
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: ab62adea95
[formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]
Former-commit-id: 7db247e33a
2012-11-12 14:13:06 -06:00
Lee Venable
4f26da9a9a
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 879078484e
[formerly a2a570c55e93b328735e2d2af887eadada92b6ea]
Former-commit-id: 62c42850e8
2012-11-12 14:09:44 -06:00
Roger Ferrel
73d9e78e92
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 3676829e8f
[formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]
Former-commit-id: ee323d9c60
2012-11-12 13:20:05 -06:00
Matt Nash
d728ffadd0
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 1480e0abfc
[formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]
Former-commit-id: 0a2f7c9ed2
2012-11-12 12:53:26 -06:00
Roger Ferrel
195d876753
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 30ef939e3c
[formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]
Former-commit-id: 438731ca2e
2012-11-12 12:00:03 -06:00
Roger Ferrel
e01a4ae243
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d89ce26aeb
[formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]
Former-commit-id: d489a7ef9f
2012-11-12 07:14:15 -06:00
Lee Venable
a267d9020b
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: 109076cb73
[formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]
Former-commit-id: dac9544eed
2012-11-08 17:06:54 -06:00
Nate Jensen
5e3c076506
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: a92bfa9393
[formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]
Former-commit-id: cdd6a986e8
2012-11-08 14:50:17 -06:00
Dustin Johnson
0806be04dd
Issue #1302 Restore jdom.jar, delete net.jcip/.project
...
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 595c421e47
[formerly 49b999039c470a5df095a202b5a67bf036a5b71c]
Former-commit-id: 2b6e98954e
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
884c82c4fe
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 535c73051d
[formerly 8db340a796df354059f3d4142db92dfd5fa527f5]
Former-commit-id: 693090cb36
2012-11-08 14:45:36 -06:00
Roger Ferrel
05825bd6f3
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: e26b14a84d
[formerly a2a52b7754d831406e591763930f419def7cb1eb]
Former-commit-id: 89617dda68
2012-11-08 11:19:51 -06:00
Lee Venable
7b5f085643
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: be460c956e
[formerly ac3fa82789459f71be3ef8cea589606e10b6506f]
Former-commit-id: e791e73a30
2012-11-08 11:11:15 -06:00