Steve Harris
|
8fb747ad27
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Juliya Dynina
|
5a9181fcc1
|
Merge "ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina" into asm_14.2.2
Former-commit-id: bf765525b7 [formerly b5e4bc1fdc] [formerly bf765525b7 [formerly b5e4bc1fdc] [formerly 102da2d0f7 [formerly 714dbccbd26a1b6fafa486b2ddbce98d7f38c8eb]]]
Former-commit-id: 102da2d0f7
Former-commit-id: b4d23902a7 [formerly 7ed2a8cbd4]
Former-commit-id: 8f3581340b
|
2014-07-01 10:05:57 -05:00 |
|
Qinglu.Lin
|
7235488050
|
ASM #663 - WarnGen does not properly handle Outer Banks Counties in North Carolina
Change-Id: If7fbcea362618e0dea5153f65489388b406b7a81
Former-commit-id: 1180b31875 [formerly 1200633cd2] [formerly 1180b31875 [formerly 1200633cd2] [formerly 1d52d020eb [formerly 4d50beaed59d785d923e357f8ce036f6625ce4b4]]]
Former-commit-id: 1d52d020eb
Former-commit-id: 5e07f13dd8 [formerly 6e4b7e1e6d]
Former-commit-id: 3eaedad105
|
2014-06-30 13:09:15 -04:00 |
|
David Friedman
|
18b1d17550
|
ASM #660 - WarnGen can generate polygons that do not match hatched area
Change-Id: I48e93e69d75e903b266f5bb615dd8a72e8813652
Former-commit-id: c4967a96fb [formerly 18b3b61afc] [formerly c4967a96fb [formerly 18b3b61afc] [formerly dc25040a25 [formerly 993663cbee3f794981fc7f4cc97f96e3b86c47f8]]]
Former-commit-id: dc25040a25
Former-commit-id: 217aa6ce76 [formerly b546ca6ac8]
Former-commit-id: a756c1436b
|
2014-06-27 19:17:55 +00:00 |
|
Michael Gamazaychikov
|
a5e993422b
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: I6d3a180d850060483742130c1550ac88f133d6e6
Former-commit-id: 27789e1601 [formerly 7004d99fb8] [formerly 27789e1601 [formerly 7004d99fb8] [formerly 3a340e084c [formerly 7b7a2fcb393b09b9f0cb2077f1603410edcc9dab]]]
Former-commit-id: 3a340e084c
Former-commit-id: f9bc1deab4 [formerly 7ca228ca84]
Former-commit-id: e39b6b0c6f
|
2014-06-23 13:58:38 -04:00 |
|
Steve Harris
|
196f53e609
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Nate Jensen
|
985da469eb
|
Omaha #3270 fix warngen manifest's register buddy
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2
Former-commit-id: eeb97a239a [formerly 31b3029e02] [formerly eeb97a239a [formerly 31b3029e02] [formerly 305564d6f0 [formerly 796e242b031087e08b9ba5e44664d6b400405c42]]]
Former-commit-id: 305564d6f0
Former-commit-id: eeb4824569 [formerly 0b185c3b6c]
Former-commit-id: 0a893a8692
|
2014-06-12 13:58:27 -05:00 |
|
Steve Harris
|
172cca39d9
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
|
2014-05-27 14:48:24 -04:00 |
|
Brian.Dyke
|
b0b377e811
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 822ad181bf [formerly 2fd18d14d6] [formerly 822ad181bf [formerly 2fd18d14d6] [formerly db68b80bbd [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]
Former-commit-id: db68b80bbd
Former-commit-id: 937b9bb9ce [formerly ebcaebb28d]
Former-commit-id: f42d40c3a3
|
2014-05-20 14:35:34 -04:00 |
|
Brian.Dyke
|
3d35be33cb
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: c4b7b8dd74 [formerly dbd3bb54e8] [formerly c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f2885c9996 [formerly f30bd7d9ae]
Former-commit-id: 39d8bd9004
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
b65a3a3214
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: 2eae2be646 [formerly b29db01a59] [formerly 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]
Former-commit-id: 06c2478539
Former-commit-id: 3558d8f162 [formerly 9baa09f4bc]
Former-commit-id: c88e8d41b6
|
2014-05-19 13:26:45 -04:00 |
|
Brian.Dyke
|
eefa4dbf96
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 509616ba6a [formerly f8ed9c7944] [formerly 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]
Former-commit-id: e9bd17a21f
Former-commit-id: e563eb3376 [formerly 409a48b907]
Former-commit-id: acf4cbbd78
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
1d53f6d304
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
603c6a1843
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: b7d276d00f [formerly 75c4b15e8e] [formerly b7d276d00f [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]
Former-commit-id: c5097660c2
Former-commit-id: bdae3cdfdf [formerly 89fa05128e]
Former-commit-id: 42c5ce2aff
|
2014-05-14 15:30:16 -04:00 |
|
Steve Harris
|
82045e2409
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: 848519177d [formerly cf62cf4a6e] [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1] [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Michael Gamazaychikov
|
ce40c60dd3
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 65353b595e [formerly 4f541a5460] [formerly 65353b595e [formerly 4f541a5460] [formerly 8a9c7ecb11 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: eb159fb31f [formerly 447eca7802]
Former-commit-id: 14440818e7
|
2014-05-12 13:33:58 +01:00 |
|
Michael Gamazaychikov
|
b9d57aa0b4
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: 4a7d050dd4 [formerly e7341afe4d] [formerly 4a7d050dd4 [formerly e7341afe4d] [formerly 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]]]
Former-commit-id: 588cfd0608
Former-commit-id: 5c73491447 [formerly 31c221bc37]
Former-commit-id: 7b5e8942cf
|
2014-05-08 14:02:21 +01:00 |
|
Qinglu.Lin
|
03f7862321
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 5f0e0bda69 [formerly 18e92f03c1] [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]
Former-commit-id: d8753a4145
Former-commit-id: 580d7e3ba7 [formerly 8de2d2f718]
Former-commit-id: 6ba15bd00c
|
2014-05-05 11:54:56 -04:00 |
|
Steve Harris
|
4fe84ba0fd
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
|
2014-05-05 08:21:02 -05:00 |
|
Qinglu.Lin
|
f8c13f1d3b
|
ASM #123 Zone UGC line not locked
Change-Id: I5eb7ed0bee68599fe4ece0810fe76cb5c794d29c
Former-commit-id: b51bdd9107 [formerly e489658072] [formerly b51bdd9107 [formerly e489658072] [formerly 13c81f9468 [formerly 108895dccefb42c71d0f47b13bfd64591e8dca98]]]
Former-commit-id: 13c81f9468
Former-commit-id: 895a652b4c [formerly caf57dbabe]
Former-commit-id: 1bdf714eba
|
2014-05-01 14:49:27 -04:00 |
|
Brian.Dyke
|
378332d8bb
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: eff27f5504 [formerly a19f01c620] [formerly eff27f5504 [formerly a19f01c620] [formerly e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]]]
Former-commit-id: e82fc8f89c
Former-commit-id: af2d8f5bad [formerly df6f06bef5]
Former-commit-id: 0fa669acce
|
2014-04-24 13:01:50 -04:00 |
|
Richard Peter
|
a22345ea6b
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: cd51f3fa87 [formerly 3575d6586f] [formerly cd51f3fa87 [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: d65b11d404 [formerly a7ec0bcf66]
Former-commit-id: b6482f2e54
|
2014-04-11 16:23:09 -05:00 |
|
David Friedman
|
8f8f55dd3c
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: 32a7adbe4b [formerly fd900e38c2] [formerly 32a7adbe4b [formerly fd900e38c2] [formerly f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1168a3eae5 [formerly 533d15c863]
Former-commit-id: dde12b4fc3
|
2014-03-27 19:17:03 +00:00 |
|
Qinglu.Lin
|
119fc9840e
|
ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05
Former-commit-id: 09e90dfe43 [formerly 4b3c821ce0] [formerly 09e90dfe43 [formerly 4b3c821ce0] [formerly af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]]]
Former-commit-id: af82143e84
Former-commit-id: 1b352b8600 [formerly bd7d68bd16]
Former-commit-id: 72b8b32e25
|
2014-03-17 18:17:49 -04:00 |
|
Max Schenkelberg
|
c6cf08db73
|
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: 59434c8a60 [formerly a01a6d68d0] [formerly 59434c8a60 [formerly a01a6d68d0] [formerly cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: 39e1c4fa46 [formerly 654da3c0a2]
Former-commit-id: f509321134
|
2014-03-04 09:23:36 -06:00 |
|
Richard Peter
|
5fab51d41b
|
Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java
Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75
Former-commit-id: 7bd6a07913 [formerly 0e25ae35c1] [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5 [formerly f13c86bc3e]
Former-commit-id: 9b3f8f9649
|
2014-02-27 15:18:26 -06:00 |
|
Ron Anderson
|
e91fd1d683
|
Issue #2819 Removed more unnecessary .clone() calls
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 663cb4cb62 [formerly 5258aecf45] [formerly 663cb4cb62 [formerly 5258aecf45] [formerly 419e9d0b8d [formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 908e43039e [formerly 8a41723ba6]
Former-commit-id: b0a4b63689
|
2014-02-19 11:55:11 -06:00 |
|
Ron Anderson
|
8a7af092f2
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
|
2014-02-18 10:45:20 -06:00 |
|
Michael Gamazaychikov
|
554c3286a9
|
ASM #94
Change-Id: I97797a7adbd17532b261987caf2fdcaa1d39c9ed
Former-commit-id: 8cd5cce89e [formerly 42399284ca] [formerly 8cd5cce89e [formerly 42399284ca] [formerly b63053d8b4 [formerly 3c9c34c84ac1cd4962c3e6f877bd33b37aab705a]]]
Former-commit-id: b63053d8b4
Former-commit-id: 293dd963f1 [formerly 60de3bbc43]
Former-commit-id: e5ca7e8740
|
2014-02-11 01:32:37 +00:00 |
|
brian.dyke
|
ca9263003a
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: 4a62e83835 [formerly 2294c81a57] [formerly 4a62e83835 [formerly 2294c81a57] [formerly f10f6d4e8a [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]]
Former-commit-id: f10f6d4e8a
Former-commit-id: 621464ac0d [formerly e9e2eb3be0]
Former-commit-id: dcf5f25ed1
|
2014-01-27 15:27:49 -05:00 |
|
gerritcm
|
6bf3189db9
|
14.1.1-16 baseline
Former-commit-id: 9e935404d8 [formerly 6be938e6eb] [formerly 9e935404d8 [formerly 6be938e6eb] [formerly b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]]]
Former-commit-id: b84f7d4203
Former-commit-id: b72cd19055 [formerly 644da23327]
Former-commit-id: 5f79da2501
|
2014-01-16 16:43:05 -05:00 |
|
Qinglu.Lin
|
60bfe0d9bc
|
Issue #123
Change-Id: Iac88a9d04fce04b4f604fb3d29c6591c90d85a65
Former-commit-id: e52d03fd37 [formerly 1c2b48a66e] [formerly e52d03fd37 [formerly 1c2b48a66e] [formerly 14e34361db [formerly bbd87416db31892d00960da0d9076e265578dd43]]]
Former-commit-id: 14e34361db
Former-commit-id: f606fdb839 [formerly 1aba68221a]
Former-commit-id: 681c0df42f
|
2014-01-09 14:13:25 -05:00 |
|
Max Schenkelberg
|
783391423f
|
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: b3aed99142 [formerly 16046a4dde] [formerly b3aed99142 [formerly 16046a4dde] [formerly cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: 0ceaa43902 [formerly f58795f460]
Former-commit-id: 789a279475
|
2014-01-06 17:03:45 -06:00 |
|
Qinglu.Lin
|
4a36b4add7
|
Issue #117
Change-Id: I83e97c43ab9c27a965a9329d5cc4d691c7e20dc2
Former-commit-id: 9eb26957f2 [formerly 6e1dd369a8] [formerly 9eb26957f2 [formerly 6e1dd369a8] [formerly cfc815af76 [formerly c877d3db7b960309def150343672757b59b353a3]]]
Former-commit-id: cfc815af76
Former-commit-id: b3d17992b8 [formerly 3a1e624b72]
Former-commit-id: c1ada67b8c
|
2013-12-20 14:31:16 -05:00 |
|
Qinglu.Lin
|
2ae0355053
|
Issue #117
Change-Id: I52293e2148fdc1fbfd22ad01e03d6d628cd1c09a
Former-commit-id: 50732574aa [formerly db66cbb605] [formerly 50732574aa [formerly db66cbb605] [formerly 5dc466443b [formerly 6f197a78afa6a8760f852e94861950a230eaedcc]]]
Former-commit-id: 5dc466443b
Former-commit-id: 66f60fc4a7 [formerly 5026332931]
Former-commit-id: 986593f331
|
2013-12-20 14:21:54 -05:00 |
|
Jonathan Sanchez
|
cb03686dc8
|
Issue #2604 Refactored portions util out of viz.warngen.
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10
Former-commit-id: 9878c3a797 [formerly 125e747fc9] [formerly 9878c3a797 [formerly 125e747fc9] [formerly 2ecfe79516 [formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]
Former-commit-id: 2ecfe79516
Former-commit-id: 45903c0e7d [formerly 5796d108c3]
Former-commit-id: a2e5cdeae5
|
2013-12-11 14:59:16 -06:00 |
|
Richard Peter
|
ae6e34be4b
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
|
2013-12-05 12:12:27 -06:00 |
|
Steve Harris
|
ea65181d19
|
14.1.1-10 baseline
Former-commit-id: 8251107646 [formerly ca0f65bd9a] [formerly 8251107646 [formerly ca0f65bd9a] [formerly 9248695a1f [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]
Former-commit-id: 9248695a1f
Former-commit-id: e35ec60f7e [formerly ef6e0b0304]
Former-commit-id: 36d788890a
|
2013-11-19 16:40:25 -05:00 |
|
Steve Harris
|
d2104614be
|
14.1.1-8 baseline
Former-commit-id: 90bc008a50 [formerly aa6c977e7b] [formerly 90bc008a50 [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: b7ca6163e3 [formerly 0123596fd9]
Former-commit-id: 42ece4fb6a
|
2013-11-13 12:32:17 -05:00 |
|
Steve Harris
|
b8cf485614
|
Merge branch 'omaha_13.5.3' into development
Former-commit-id: 51af205d06 [formerly 9dabbc7b8e] [formerly 51af205d06 [formerly 9dabbc7b8e] [formerly 66f99f3974 [formerly 65d3e37b287dd2f429aba4d70c24bde3f1bc6470]]]
Former-commit-id: 66f99f3974
Former-commit-id: 48997c36f0 [formerly 9f1d93a2cf]
Former-commit-id: 92cf79a7cc
|
2013-11-11 15:40:45 -06:00 |
|
Steve Harris
|
889db4bc7b
|
13.5.3-7 baseline
Former-commit-id: 36af5686bd [formerly 21bed95fa4] [formerly 36af5686bd [formerly 21bed95fa4] [formerly 47102ee47b [formerly a9ada72dc63cd460499052171c61323b438bb10d]]]
Former-commit-id: 47102ee47b
Former-commit-id: 142f1201b3 [formerly 3599d7f09b]
Former-commit-id: 0c54c50443
|
2013-11-11 16:33:51 -05:00 |
|
Richard Peter
|
94e0faa6c6
|
Merge branch 'omaha_13.5.3' (13.5.3-5) into development
Conflicts:
RadarServer/com.raytheon.rcm.feature/feature.xml
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9
Former-commit-id: 25df870b67 [formerly fa7d77ae97] [formerly 25df870b67 [formerly fa7d77ae97] [formerly 93c776022a [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: c97efbf656 [formerly 520dd57f02]
Former-commit-id: 910464ea6a
|
2013-11-07 14:25:45 -06:00 |
|
Steve Harris
|
cfb3194426
|
14.1.1-7 baseline
Former-commit-id: 80614c0e52 [formerly 3328e2dd1d] [formerly 80614c0e52 [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]
Former-commit-id: 4fff87723f
Former-commit-id: b694612fe0 [formerly 48df058653]
Former-commit-id: 647b908fed
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
0aa90a7855
|
14.1.1-6 baseline
Former-commit-id: 946a9be17e [formerly 0cb2978c13] [formerly 946a9be17e [formerly 0cb2978c13] [formerly 6067af4252 [formerly 7029e583ef36bf746fddda316ba011e27ed766b4]]]
Former-commit-id: 6067af4252
Former-commit-id: e86a0aa489 [formerly 26da1ce793]
Former-commit-id: 270c5f1a2d
|
2013-11-06 14:08:33 -05:00 |
|
Steve Harris
|
ef72863e6f
|
13.5.3-3 baseline
Former-commit-id: 883ad32443 [formerly baa036cd62] [formerly 883ad32443 [formerly baa036cd62] [formerly 1503847a4b [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: a58b825dde [formerly 6b879b2465]
Former-commit-id: 5be6e21405
|
2013-10-31 12:52:07 -04:00 |
|
Steve Harris
|
6da47cfbdd
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 5aac54b9f9 [formerly 0ab03f2796] [formerly 5aac54b9f9 [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]
Former-commit-id: 83d2194a5a
Former-commit-id: 771be074c0 [formerly 0efff318b8]
Former-commit-id: f5fc091e48
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
e90722d781
|
13.5.3-2 baseline
Former-commit-id: c6d951b390 [formerly 055783655b] [formerly c6d951b390 [formerly 055783655b] [formerly 6d85d944a6 [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 0c17777164 [formerly aef0e828d2]
Former-commit-id: 1cc13c9992
|
2013-10-30 12:53:25 -04:00 |
|
Steve Harris
|
da4589ec2b
|
14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
|
2013-10-28 10:55:16 -04:00 |
|