Commit graph

46 commits

Author SHA1 Message Date
Roger Ferrel
d9197606ff Issue #1578 Changes for non-blocking FlashFloodGuidanceDlg.
Change-Id: I00efe50ba8e0fe11fcca560ef2d07293c9bdf771

Former-commit-id: 0c5e92eb7f [formerly bb69390c9b] [formerly 78a7d02fd2 [formerly d3fd2d7f0591f6fbe15d522a6c909f4509fede94]]
Former-commit-id: 78a7d02fd2
Former-commit-id: c1b45bd6c9
2013-02-07 08:27:18 -06:00
Roger Ferrel
fc8537fb12 Issue #1578 Code clean up for non-blocking dialogs.
Changes from code review.

Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047

Former-commit-id: 5e2b33206c [formerly 581b04f8f7] [formerly db818dfd35 [formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]
Former-commit-id: db818dfd35
Former-commit-id: 1029538171
2013-02-06 13:42:57 -06:00
Roger Ferrel
30a1f42557 Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507

Former-commit-id: a558cbc03a [formerly eaa3834f6b] [formerly dc965dc82a [formerly 413491362e25a08b7e43f86987cc059f794a674b]]
Former-commit-id: dc965dc82a
Former-commit-id: d9d53340bb
2013-02-05 16:13:08 -06:00
Mike Duff
f5ef2dc1fe Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 24e9ae73f0 [formerly fc24735297] [formerly f03e9cc5ce [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]
Former-commit-id: f03e9cc5ce
Former-commit-id: a51d48db5e
2013-01-30 16:38:04 -06:00
Richard Peter
79ef100838 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
2013-01-14 18:07:17 -06:00
Steve Harris
e34695538d 13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
2013-01-14 18:42:21 -05:00
Richard Peter
80bf1d7a28 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
2013-01-09 17:55:05 -06:00
Steve Harris
82a1ed77a4 13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Steve Harris
15849ae72a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]
Former-commit-id: ce72ebb094
Former-commit-id: 113fdcb679
2012-12-11 08:56:54 -06:00
Steve Harris
f02c1ef71d Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
2012-12-11 08:45:53 -06:00
Roger Ferrel
80d7309ea7 Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: f9a8d30c4d [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]
Former-commit-id: 40b8e4ec57
Former-commit-id: fdad99bcc8
2012-12-10 11:30:06 -06:00
Roger Ferrel
bc26433783 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: f72e89ad2c [formerly 921566317a] [formerly 81966d39fc [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]
Former-commit-id: 81966d39fc
Former-commit-id: 053584c4e2
2012-12-07 14:43:53 -06:00
Steve Harris
69ab975fab 12.12.1-12 baseline
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
2012-12-06 09:18:28 -06:00
Steve Harris
ff4131c2ee 12.12.1-8 baseline
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
2012-12-06 09:02:51 -06:00
Steve Harris
21ecd53719 Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
2012-11-13 17:28:50 -06:00
Steve Harris
111e7607cf 12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
109ec1e778 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: ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
9b8f2bcdbd merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
2012-10-25 12:22:11 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Steve Harris
725b2f8ba5 12.11.1-3 baseline
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
2012-10-15 16:30:31 -05:00
Ben Steffensmeier
fde1e73d58 Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 266a2f317f
Former-commit-id: fed5a35af3
2012-10-12 12:45:50 -05:00
Steve Harris
772c60efa4 12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
3a1ba7bd87 Issue #189 convert hydro and hydrocommon to grid.
Former-commit-id: 3e0da6d171 [formerly 8d150d404c] [formerly 3e93e8980b [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]
Former-commit-id: 3e93e8980b
Former-commit-id: 734922cb44
2012-10-01 14:05:40 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
9512238d6e Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 8e5b20236d [formerly 9632663c0a] [formerly f918b6636f [formerly 003825d9634299773ad96843cc82d56ded8a1391]]
Former-commit-id: f918b6636f
Former-commit-id: 6c38e6abb2
2012-09-24 14:05:22 -05:00
Steve Harris
a903893a09 12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
2012-09-17 15:42:31 -05:00
Steve Harris
684feb34e5 12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
2012-09-13 12:08:11 -05:00
Steve Harris
e720b8ed31 12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
2012-09-04 12:07:27 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
d7d60cc623 12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: 33b95fb96d
Former-commit-id: 9990bf909b
2012-08-15 15:19:10 -05:00
Steve Harris
aed7a644df 12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
2012-08-15 13:59:00 -05:00
Steve Harris
dab00b12e6 12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
2012-08-01 10:45:37 -05:00
Steve Harris
f2102bfb24 12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -05:00
Steve Harris
dc50bc8443 12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Steve Harris
97c4db937e 12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
8bc60b1e32 12.3.1-10 baseline
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
2012-03-30 08:38:33 -05:00
Steve Harris
4eb1ef5b0f Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: 86e586befe
Former-commit-id: 938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
b55a488ed8 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
b41e5f2415 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: a2fd2cf6fa [formerly 6a064cb78b] [formerly d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: d02529fef4
Former-commit-id: d133454b27
2012-02-20 12:54:25 -06:00
Steve Harris
1ac6b36d1f Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Matt Nash
919433b8d4 Issue #26 tear off menu changes to fix issues
Former-commit-id: 0ea872be36 [formerly 542049e455] [formerly 0ff3ef8d72 [formerly 30c43cbcd4500c5754261b420f5c9b031bd63014]]
Former-commit-id: 0ff3ef8d72
Former-commit-id: 88689efbfa
2012-02-03 13:13:15 -06:00
Matt Nash
82300ccdcf Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00