xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1294 commits 31 branches 40 tags 3.8 GiB
Commit graph

890 commits

Author SHA1 Message Date
Lee Venable
fae33021a4 Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development 
Former-commit-id: c44f90f675 [formerly ff5083715b [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]
Former-commit-id: ff5083715b
Former-commit-id: c4526c5ba0
 2012-11-08 10:57:45 -06:00
Nate Jensen
d701700a35 Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development 
Former-commit-id: 48dae3a5e9 [formerly 9038ff4e10 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]
Former-commit-id: 9038ff4e10
Former-commit-id: ca5db2ec43
 2012-11-08 10:34:56 -06:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
 2012-11-08 09:57:16 -06:00
Roger Ferrel
c44dd45f87 Issue #1298 Changes for non-blocking FuzzValueDialog. 
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef

Former-commit-id: c3f451f799 [formerly 023252fb84 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]
Former-commit-id: 023252fb84
Former-commit-id: 3ad0d7d516
 2012-11-08 08:24:38 -06:00
Roger Ferrel
4aafcb8311 Issue #1298 Chnages for non-blocking FindReplaceDlg. 
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7

Former-commit-id: 199475f671 [formerly 76f60240c5 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]
Former-commit-id: 76f60240c5
Former-commit-id: 94a4440625
 2012-11-08 07:57:56 -06:00
Nate Jensen
b0bb920fde Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development 
Former-commit-id: 6b205399d4 [formerly b32a9e839e [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: b32a9e839e
Former-commit-id: 20a63254e2
 2012-11-07 18:18:06 -06:00
Lee Venable
dbeb600e58 Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development 
Former-commit-id: 8956718961 [formerly 36c44db46b [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]
Former-commit-id: 36c44db46b
Former-commit-id: c8955b5425
 2012-11-07 17:38:21 -06:00
Roger Ferrel
d6d99f5e30 Issue #1298 Changes for non-blocking ClearZoneGroupsDialog. 
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: 65d10be5d6 [formerly a46535ee0c [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]
Former-commit-id: a46535ee0c
Former-commit-id: ee038e811c
 2012-11-07 15:07:47 -06:00
Roger Ferrel
dd9e28d58a Issue #1298 Changes for non-blocking CallToActionsDlg. 
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc

Former-commit-id: 81de6cd45b [formerly 190922a233 [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]
Former-commit-id: 190922a233
Former-commit-id: 4b0c701d69
 2012-11-07 14:35:38 -06:00
Lee Venable
f4a62abbda Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development 
Former-commit-id: 297d2bbc9c [formerly f368b93484 [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]
Former-commit-id: f368b93484
Former-commit-id: 074543d75e
 2012-11-07 12:31:39 -06:00
Roger Ferrel
977d7c5ead Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking. 
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91

Former-commit-id: 974431a13a [formerly 82abbbf0b7 [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]
Former-commit-id: 82abbbf0b7
Former-commit-id: 8bf89ad495
 2012-11-07 11:27:36 -06:00
Max Schenkelberg
94e64c9b0d Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
 2012-11-07 10:44:42 -06:00
Matt Nash
5b17b0f296 Issue #1273 product browser can now change order for grid 
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2

Former-commit-id: 284aecc6f9 [formerly 9c9db6643a [formerly 9c7477357508794a00267991b825d169df5ae71a]]
Former-commit-id: 9c9db6643a
Former-commit-id: 76cdfc09bb
 2012-11-06 14:06:49 -06:00
Roger Ferrel
48141292fb Issue #1304 Clear text field when point removed. 
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc

Former-commit-id: 1f71a3bed7 [formerly 921134848b [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]
Former-commit-id: 921134848b
Former-commit-id: a6b093c2ce
 2012-11-05 12:56:07 -06:00
Roger Ferrel
d6916f4ec3 Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog. 
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3

Former-commit-id: 3045291a29 [formerly 986766487f [formerly d296028a9a0add9a81836030ff7b65be8883956b]]
Former-commit-id: 986766487f
Former-commit-id: 120764c5ef
 2012-11-05 11:22:28 -06:00
Dustin Johnson
7d0e4a6e75 Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
 2012-11-01 13:36:06 -05:00
Ben Steffensmeier
ca1037e96b Issue #189 a few fixes to grid resources for FFG Mosaic 
Former-commit-id: 4b121fd7b3 [formerly 64d4a1add7 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]
Former-commit-id: 64d4a1add7
Former-commit-id: dc0e75eb29
 2012-10-31 11:39:32 -05:00
Roger Ferrel
ac49925d87 Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog. 
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc

Former-commit-id: 3c64544822 [formerly d92be142ad [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]
Former-commit-id: d92be142ad
Former-commit-id: 2b80c2c2b5
 2012-10-30 17:09:52 -05:00
Lee Venable
0b9b82f99d Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development 
Former-commit-id: 2c86fdb2d0 [formerly 868fe53216 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]
Former-commit-id: 868fe53216
Former-commit-id: 51c60c1876
 2012-10-30 16:46:30 -05:00
Lee Venable
06ae8809fa Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development 
Former-commit-id: e47d1beb09 [formerly 276ce2ad08 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]
Former-commit-id: 276ce2ad08
Former-commit-id: 08e6cd0a31
 2012-10-30 16:45:35 -05:00
Lee Venable
c98c1c4e22 Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development 
Former-commit-id: 0bc4ec2135 [formerly 33525e4dff [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]
Former-commit-id: 33525e4dff
Former-commit-id: eed01fd643
 2012-10-30 16:44:56 -05:00
Roger Ferrel
b57c7c2db8 Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog. 
Change-Id: I6151274f455066c03db49618d6b5801248d48527

Former-commit-id: 7c8f48fcb5 [formerly 0c544da917 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]
Former-commit-id: 0c544da917
Former-commit-id: 84a338fd4c
 2012-10-30 15:19:08 -05:00
Roger Ferrel
0c3a8eb482 Issue #1298 Changes for non-blocking BrightnessDialog. 
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483

Former-commit-id: 2fb06a145f [formerly bc1e462d07 [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]
Former-commit-id: bc1e462d07
Former-commit-id: 9dcaf583f6
 2012-10-30 14:00:20 -05:00
Roger Ferrel
a155a8522e Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking. 
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0

Former-commit-id: e37a097596 [formerly 8952e1cef8 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]
Former-commit-id: 8952e1cef8
Former-commit-id: 3b96d312cd
 2012-10-30 12:35:48 -05:00
Ben Steffensmeier
c789e1fd94 merge branch Unifeid_Grid into developement 
Former-commit-id: b6a1563bb2 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: d0a2ed32b5
Former-commit-id: 272e057bf1
 2012-10-30 12:24:54 -05:00
Roger Ferrel
ade948f7c9 Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog. 
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620

Former-commit-id: 5355b7f620 [formerly 87d3ff985e [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]
Former-commit-id: 87d3ff985e
Former-commit-id: 6291083e5b
 2012-10-30 10:34:40 -05:00
Lee Venable
4bb79b9b66 Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development 
Former-commit-id: 676856f62f [formerly a7eb12fd9e [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]
Former-commit-id: a7eb12fd9e
Former-commit-id: 3c6facf14b
 2012-10-30 10:26:53 -05:00
Roger Ferrel
bec091ddc3 Issue #1298 Changes for non-blocking WeatherElementBrowserDialog. 
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e

Former-commit-id: 4a13cfb8a6 [formerly f65213c542 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]]
Former-commit-id: f65213c542
Former-commit-id: 2f4ead5037
 2012-10-30 09:00:10 -05:00
Roger Ferrel
a49904ad7b Issue #1298 Changes for non-blocking TimeShiftDialog. 
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c

Former-commit-id: 7af20b6130 [formerly 1d67e245aa [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]]
Former-commit-id: 1d67e245aa
Former-commit-id: a6f06c265b
 2012-10-30 08:27:25 -05:00
Roger Ferrel
78dfc213c2 Issue #1287 Changes for blocking ServiceBackupDlg in stand alone mode and removal no longer uses class. 
Change-Id: Ice2b62bd22044f77536e00650962bfb9ea7d4082

Former-commit-id: 4a2ae2f6db [formerly 55461bc61d [formerly ac8b26304f847a41c7b9befcc0d16b76e9a8e16d]]
Former-commit-id: 55461bc61d
Former-commit-id: af547b7c6f
 2012-10-29 13:31:43 -05:00
Steve Harris
eb8a05a414 Merge branch 'ss_builds' into development 
Former-commit-id: afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: fb46bb053d
Former-commit-id: 340ce53e22
 2012-10-29 12:17:12 -05:00
Steve Harris
7f6baf2e24 12.11.1-12 baseline 
Former-commit-id: 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 8682e4f6ca
Former-commit-id: 565756567f
 2012-10-29 12:15:56 -05:00
Lee Venable
2cf0d131a3 Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development 
Former-commit-id: 4bc57aec7e [formerly eb660ac54d [formerly edfda206905211559bfd5b384ccae129d11bb5cb]]
Former-commit-id: eb660ac54d
Former-commit-id: 01bd16bbd7
 2012-10-29 08:40:34 -05:00
Roger Ferrel
b2324bd5c0 Issue #1287 Changes for non-blocking TimeScalePeriodsDialog. 
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049

Former-commit-id: 99179463f5 [formerly ea2fdbc1b8 [formerly aa32e71beadc5b9302abddedeb53003a66a57261]]
Former-commit-id: ea2fdbc1b8
Former-commit-id: 74c8f86b27
 2012-10-29 08:09:57 -05:00
Roger Ferrel
992a338818 Issue #1287 Changes for non-blocking SiteActivationDlg. 
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744

Former-commit-id: 2ab4a8508a [formerly 8c5b00fa42 [formerly ae1185cb5825915820314fdc48c897676ead8538]]
Former-commit-id: 8c5b00fa42
Former-commit-id: b345d95b4d
 2012-10-29 07:21:00 -05:00
Lee Venable
8ee0890c61 Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development 
Former-commit-id: ddbed06f64 [formerly 6c3b12a9d3 [formerly e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b]]
Former-commit-id: 6c3b12a9d3
Former-commit-id: d7c043dffa
 2012-10-26 15:28:37 -05:00
Lee Venable
ff00f98411 Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development 
Former-commit-id: 0967a6348b [formerly 84e66d2fab [formerly 53a9d4129eadd0156855a5c9248ce2848cb08d95]]
Former-commit-id: 84e66d2fab
Former-commit-id: 656b6bf04e
 2012-10-26 15:28:07 -05:00
Lee Venable
e0a7c31e6d Merge "Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository: edexOsgi/com.raytheon.uf.common.event edexOsgi/com.raytheon.uf.common.stats edexOsgi/com.raytheon.uf.edex.event.feature edexOsgi/com.raytheon.uf.edex.event edexOsgi/com.raytheon.uf.edex.stats" into development 
Former-commit-id: 41c8c88a03 [formerly 173813c954 [formerly f67e7970061c9bc4dde3b4175dcb9b45d204ff34]]
Former-commit-id: 173813c954
Former-commit-id: 41472f07d2
 2012-10-26 15:25:52 -05:00
Roger Ferrel
c76fd6ee2c Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog. 
Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c

Former-commit-id: 37c7d61195 [formerly af887de89c [formerly a8e412f5d0cd625b6c421b0609bc7149d7386f1a]]
Former-commit-id: af887de89c
Former-commit-id: 9647a110c6
 2012-10-26 15:03:26 -05:00
Roger Ferrel
9cd6d6476d Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog. 
Change-Id: Ia01b3de6959392afacfc47ac42e794e0b8e357f2

Former-commit-id: e2b35d015f [formerly c3d2ac5976 [formerly 15e80fd970393b74f6a320a794004f89bf3619a5]]
Former-commit-id: c3d2ac5976
Former-commit-id: f304b930cd
 2012-10-26 14:44:29 -05:00
Roger Ferrel
fc3ee6eae1 Issue #1287 changes for non-blocking ISCRequestReplyDlg and SendISCDialog; removal of no longer used classes. 
Change-Id: I25b8caa1a1316a63d051fa29d913330355afcc75

Former-commit-id: 7a3149dbb3 [formerly 57a547fc66 [formerly 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7]]
Former-commit-id: 57a547fc66
Former-commit-id: 2711bab50a
 2012-10-26 14:27:00 -05:00
Brad Gonzales
1ba2a25bce Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository: 
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: 24fc32ee14 [formerly b2656df2f8 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: b2656df2f8
Former-commit-id: d26119c383
 2012-10-26 14:00:55 -05:00
Roger Ferrel
10afbd06f6 Issue #1287 Changes for non-blocking WESaveDialog. 
Change-Id: Ic2dbc76126b3b38c27cdd3fc07ca1317725d12fd

Former-commit-id: 51369fbd50 [formerly 32154a3789 [formerly e02ff1c81c669ae0bcf5c068487a9c35bc542ff2]]
Former-commit-id: 32154a3789
Former-commit-id: 6806384d21
 2012-10-26 09:01:46 -05:00
Roger Ferrel
c86686515d Issue #1287 Changes for non-blocking WERevertDialog. 
Change-Id: I7112fadab6eaaac1c7145fd998e8dfca3f975f3b

Former-commit-id: 4d2c234072 [formerly 117bcc648e [formerly 50b20b90ad974962334fb7dbf9c8fa3c369b01a1]]
Former-commit-id: 117bcc648e
Former-commit-id: a87a84fdbb
 2012-10-26 08:23:04 -05:00
Roger Ferrel
e312a9313c Issue #1287 Changes for non-blocking PublishDialog. 
Change-Id: I551850f82ad40bfa9c49d10c6b8193ec365ccea2

Former-commit-id: 93472a82e5 [formerly 833b7bb850 [formerly a0b4c4eb635ce39cf1a25c78620d317e59d33061]]
Former-commit-id: 833b7bb850
Former-commit-id: 4c40059a5a
 2012-10-26 07:07:18 -05:00
Ben Steffensmeier
25731091d2 Issue #189 changes from code review 
Former-commit-id: 7139c80557 [formerly 984d128d33 [formerly 449762acbbe74173121e19f5c325104221c083a2]]
Former-commit-id: 984d128d33
Former-commit-id: 3c222ab437
 2012-10-25 16:33:59 -05:00
Ben Steffensmeier
12eb4c8246 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid 
Former-commit-id: 6f2c1ede9e [formerly b7d61e7543 [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: b7d61e7543
Former-commit-id: 7734a983f5
 2012-10-25 16:17:54 -05:00
Lee Venable
f13b5c548d Merge "Issue #1287 Changes for non-blocking RefSetAppearanceDialog." into development 
Former-commit-id: 02ad711e0c [formerly de997956f3 [formerly 9f7230c0e0aafc6d7bd1f3608f020ed33a9f4a4d]]
Former-commit-id: de997956f3
Former-commit-id: 4caccdd1a5
 2012-10-25 16:06:53 -05:00
Roger Ferrel
65d4525212 Issue #1287 Changes for non-blocking RefSetAppearanceDialog. 
Change-Id: I0b3f5e8c57600f3d20a7662404b014adc874e6fc

Former-commit-id: 2b08397e4b [formerly 06b3d2f921 [formerly 7e64b7aa2a236d07c04b72e1eac2c660e0c87642]]
Former-commit-id: 06b3d2f921
Former-commit-id: 4d60aac952
 2012-10-25 15:23:45 -05:00
Roger Ferrel
cd0b7e55f0 Issue #1287 Changes for non-blocking ProductScriptsDialog. 
Change-Id: Ia68cd67bf7dd10eac5e0aacc9dcf68ca96f8b2f8

Former-commit-id: 73b4ca43c8 [formerly 17de26adfb [formerly df3546eba27a1cbca6204351a7961e1aabc9c787]]
Former-commit-id: 17de26adfb
Former-commit-id: 5a4c795bbc
 2012-10-25 14:13:41 -05:00