Steve Harris
b0a60923c4
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 4d4771ee3a
[formerly 43ddfe98c4
] [formerly f6988eefff
[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: f02c1ef71d
[formerly 6287b32e7d
]
Former-commit-id: ebcc9975c4
2012-12-11 08:45:53 -06:00
Max Schenkelberg
a7b239f9c1
Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
...
Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die
Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6
Former-commit-id: 56ae27e172
[formerly b648c5828e
] [formerly 56ae27e172
[formerly b648c5828e
] [formerly ed77d56a84
[formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: f681c1304c
[formerly b24440cc37
]
Former-commit-id: b8b98a78c3
2012-11-29 10:29:36 -06:00
Steve Harris
ae9d9985cd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 8fc896f7d4
[formerly 448dd1c35f
] [formerly 8fc896f7d4
[formerly 448dd1c35f
] [formerly 00f3d51546
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719
[formerly c8cac52915
]
Former-commit-id: 59efd9a217
2012-11-13 17:28:50 -06:00
Steve Harris
53d74c66e7
12.12.1-2 baseline
...
Former-commit-id: ed809a02db
[formerly a8560580f8
] [formerly ed809a02db
[formerly a8560580f8
] [formerly 6868eb9b23
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf
[formerly df89fe9bed
]
Former-commit-id: 96a4a4f3f5
2012-11-13 17:14:24 -06:00
Dustin Johnson
b4a13190ad
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: efd3d3735a
[formerly 064ef82d1e
] [formerly efd3d3735a
[formerly 064ef82d1e
] [formerly 1dbeb22893
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3
[formerly 4222b24d09
]
Former-commit-id: 6613c51d3b
2012-11-08 09:57:16 -06:00
Dustin Johnson
931d94d1de
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: 8e69107b5a
[formerly 98d7beae50
] [formerly 8e69107b5a
[formerly 98d7beae50
] [formerly 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a
[formerly bcf575966b
]
Former-commit-id: 4d9c945388
2012-11-01 13:36:06 -05:00
Steve Harris
f61c5114e8
12.10.1-4 baseline
...
Former-commit-id: 9cd1f3ec0f
[formerly 791ef6cedf
] [formerly 9cd1f3ec0f
[formerly 791ef6cedf
] [formerly 92cc2d8605
[formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]
Former-commit-id: 92cc2d8605
Former-commit-id: f641cdd4e0
[formerly b4d2a0e8dd
]
Former-commit-id: 451459d8cb
2012-09-13 12:33:36 -05:00
Steve Harris
e57e7237a9
12.10.1-4 baseline
...
Former-commit-id: e38e81ab8c
[formerly fd19ca5624
] [formerly e38e81ab8c
[formerly fd19ca5624
] [formerly 49c3861597
[formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5
[formerly 2ba58a3576
]
Former-commit-id: 26b7d083ec
2012-09-13 12:08:11 -05:00
Steve Harris
ede38c4b3f
12.9.1-10 baseline
...
Former-commit-id: bdb45cdfae
[formerly 3adc50a783
] [formerly bdb45cdfae
[formerly 3adc50a783
] [formerly cb9b80f3a0
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f
[formerly dc08c5a71a
]
Former-commit-id: 5bb474d33c
2012-08-30 14:28:27 -05:00
Steve Harris
2d928d328e
12.9.1-5 baseline
...
Former-commit-id: a1d931fd44
[formerly 61f269f54c
] [formerly a1d931fd44
[formerly 61f269f54c
] [formerly f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5
[formerly 72824561cb
]
Former-commit-id: 9b5c2094ed
2012-08-21 15:27:03 -05:00
Steve Harris
7e1d1f6e08
12.9.1-4 baseline
...
Former-commit-id: 36c108e960
[formerly dcda3a2290
] [formerly 36c108e960
[formerly dcda3a2290
] [formerly 33b95fb96d
[formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623
[formerly 9990bf909b
]
Former-commit-id: de9b64b501
2012-08-15 15:19:10 -05:00
Steve Harris
03bb51ed0e
12.9.1-3 baseline
...
Former-commit-id: c11f7d396e
[formerly 36d80b1f60
] [formerly c11f7d396e
[formerly 36d80b1f60
] [formerly 84bbf2573e
[formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba
[formerly edbbacfa8a
]
Former-commit-id: 8c5c5ad6eb
2012-08-15 14:26:10 -05:00
Steve Harris
78d66ba6df
12.8.1-10 baseline
...
Former-commit-id: 6244359a80
[formerly b5e8fee24d
] [formerly 6244359a80
[formerly b5e8fee24d
] [formerly ca25d508ec
[formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2
[formerly d5563fc340
]
Former-commit-id: 46daa48f1c
2012-08-06 09:34:26 -05:00
Steve Harris
d3be09bd74
12.8.1-5 baseline
...
Former-commit-id: 2653ddc2e3
[formerly fd2abfb6f1
] [formerly 2653ddc2e3
[formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6
[formerly e0c3722fd1
]
Former-commit-id: e86949a8d3
2012-08-01 10:45:37 -05:00
Steve Harris
36e2ad3023
12.7.1-8 baseline
...
Former-commit-id: 11f96dbedd
[formerly 16bf591a33
] [formerly 11f96dbedd
[formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24
[formerly 9f97182964
]
Former-commit-id: 9aabe438b9
2012-07-19 16:20:40 -05:00
Steve Harris
37f2b6e138
12.6.1-9 baseline
...
Former-commit-id: 7c064b6868
[formerly 2c0ff851ca
] [formerly 7c064b6868
[formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443
[formerly 4f7bb90bb0
]
Former-commit-id: d5fa61041b
2012-07-10 07:53:49 -05:00
Steve Harris
39ff9954f8
12.5.1-15 baseline
...
Former-commit-id: 8552902906
[formerly b13cbb7e00
] [formerly 8552902906
[formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e
[formerly 676ea3192f
]
Former-commit-id: 9054c5ab6c
2012-06-08 13:39:48 -05:00
Steve Harris
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82
[formerly a28d70b5c5
]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae
[formerly a4e519f3cd
]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Steve Harris
293563cfe7
12.3.1-10 baseline
...
Former-commit-id: 0e4128712b
[formerly 4068f5295f
] [formerly 0e4128712b
[formerly 4068f5295f
] [formerly 22bd792cd9
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32
[formerly ce3b74c605
]
Former-commit-id: 2e0f4b241b
2012-03-30 08:38:33 -05:00
Matt Nash
8c214b7de3
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: c4fee978d7
[formerly f7652d25e3
] [formerly c4fee978d7
[formerly f7652d25e3
] [formerly bb4f690393
[formerly 1a8d135e07c56e8ac202c01e7aa866290b28b0a4]]]
Former-commit-id: bb4f690393
Former-commit-id: d3433544ab
[formerly 82089434e5
]
Former-commit-id: 7ef7069905
2012-02-07 16:49:34 -06:00
Matt Nash
53612b087f
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: a659029ea0
[formerly f4c5d7f94b
] [formerly a659029ea0
[formerly f4c5d7f94b
] [formerly 28e3da498e
[formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]
Former-commit-id: 28e3da498e
Former-commit-id: 8dbb17b2e8
[formerly ef18b8c47f
]
Former-commit-id: cc50a32732
2012-02-07 11:45:28 -06:00
Max Schenkelberg
0f4a0c7948
Issue #206 Made tear off menu dialog activate contexts for perspective
...
Former-commit-id: c410a4eb33
[formerly 5f8d30bb43
] [formerly c410a4eb33
[formerly 5f8d30bb43
] [formerly e422b13ded
[formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]]
Former-commit-id: e422b13ded
Former-commit-id: 2185e1a31e
[formerly 3a26b0cea5
]
Former-commit-id: 1954b637a4
2012-02-01 17:03:20 -06:00
Matt Nash
8997f82570
Issue #26 add tear off code to git baseline
...
Former-commit-id: 892cb9a7ae
[formerly cf4e1f764e
] [formerly 892cb9a7ae
[formerly cf4e1f764e
] [formerly 4286cb0342
[formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]]
Former-commit-id: 4286cb0342
Former-commit-id: e8d239e963
[formerly 8e3d2af84e
]
Former-commit-id: 240ac978f2
2012-01-25 12:50:31 -06:00
Matt Nash
bcc32c10bc
Moving 12.1.1 into ss_sync
...
Former-commit-id: 580e2938d7
[formerly 66be3bec40
] [formerly 580e2938d7
[formerly 66be3bec40
] [formerly c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf
[formerly 1faae42484
]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: a02aeb236c
[formerly 9f19e3f712
] [formerly a02aeb236c
[formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59
[formerly 3360eb6c5f
]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00