Richard Peter
|
626ab0bd58
|
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: 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
|
2014-04-11 16:23:09 -05:00 |
|
Nate Jensen
|
879743ba05
|
Issue #2638 wrote java utility for generating list of data URIs and
their field names
Change-Id: I44435ed2a3f1f812b79b3d4fa906913064c60863
Former-commit-id: b64a89eff1 [formerly 5b2f17826e] [formerly 7fb97ffad0] [formerly b64a89eff1 [formerly 5b2f17826e] [formerly 7fb97ffad0] [formerly 39e167fc76 [formerly 7fb97ffad0 [formerly a3e2218d1fcc7cf8c83443f5f29cd9982b7e6f46]]]]
Former-commit-id: 39e167fc76
Former-commit-id: 0e29ec5bb4 [formerly f3de646859] [formerly 76c109bc0aaf7a0a1405976cdefd262abdaf71dc [formerly 8bf8302811]]
Former-commit-id: 0a41af5b8c365750116c369470ba9b31fd6bc188 [formerly f325498ec3]
Former-commit-id: b051dab483
|
2014-02-27 17:14:32 -06:00 |
|
Melissa Porricel
|
8f94fbbfec
|
ASM #78 - Fix MDCRS display
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38
Former-commit-id: ce444f1ea0 [formerly 20624da288] [formerly 769fc1ed2f] [formerly ce444f1ea0 [formerly 20624da288] [formerly 769fc1ed2f] [formerly e5213e9415 [formerly 769fc1ed2f [formerly 2c655d5313882f811219c7a16f713d977008f949]]]]
Former-commit-id: e5213e9415
Former-commit-id: 6438d70b85 [formerly 8daf0520bc] [formerly 738d69c8e5a1f10b847ad7775268f2abe518e72b [formerly 774e236d63]]
Former-commit-id: 97df7b9cde72aecd786e37551eb3da8b9d03a6d6 [formerly eafea2f5ee]
Former-commit-id: adc09f6896
|
2014-02-27 12:48:09 -05:00 |
|
Nate Jensen
|
6080d94522
|
Issue #2361 once again try to remove more common ISerializableObject
Change-Id: I149fa1009b2d85b2c2f5e9247515eecb835dad09
Former-commit-id: a085291451 [formerly 46edfda4da] [formerly 40d8e42b87] [formerly a085291451 [formerly 46edfda4da] [formerly 40d8e42b87] [formerly 4b80a31f22 [formerly 40d8e42b87 [formerly 05585a1d0f9fdab55c8ad2ce83d8e979450521ba]]]]
Former-commit-id: 4b80a31f22
Former-commit-id: 5c2e8c802f [formerly 1742f9a3fa] [formerly deae503ad96698888f88175ce8cef56e53c6078d [formerly f782d20320]]
Former-commit-id: 84afe3a81722f6ad8cb6013816732662d77b2f29 [formerly 4cc5c62aef]
Former-commit-id: fd99fccc73
|
2013-10-23 11:40:13 -05:00 |
|
Richard Peter
|
92a830f293
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 713d540d81 [formerly ff660a78c7] [formerly 592218edb8] [formerly 713d540d81 [formerly ff660a78c7] [formerly 592218edb8] [formerly 7175e78cf7 [formerly 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]]]
Former-commit-id: 7175e78cf7
Former-commit-id: 7f91e8dbb4 [formerly 9aec8b3f88] [formerly fd064b084aa46ae3c60ddfdc327034162847bcf0 [formerly ae956e3b4b]]
Former-commit-id: 6d53959601baa239b570e43fa359a5ce33b1ee57 [formerly beb492620b]
Former-commit-id: e154f87cf4
|
2013-09-03 11:51:27 -05:00 |
|
Max Schenkelberg
|
aabbb25c6d
|
Issue #2190 Cleaned up sounding and cloud height dependencies
Change-Id: If07406f7e618fca0ea001b56a81b8552d9d44546
Former-commit-id: 0b21274439 [formerly dccc265ab0] [formerly d4c7a0c302] [formerly 0b21274439 [formerly dccc265ab0] [formerly d4c7a0c302] [formerly 56fef93541 [formerly d4c7a0c302 [formerly 767ecfd7f2930de641d532d08120d5023b6e38e4]]]]
Former-commit-id: 56fef93541
Former-commit-id: aee63f150f [formerly 8ea57bfbac] [formerly 780ccd7e833e37069d808d836ad303c6cf184e97 [formerly 8ad1acdbc5]]
Former-commit-id: deb62ce2eff58fb093fa318250144087333c3c68 [formerly 43344e0340]
Former-commit-id: 7f1784e352
|
2013-07-12 10:12:48 -05:00 |
|
Ben Steffensmeier
|
2b26557020
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7c91a83521 [formerly dab2af2df5] [formerly 4209e014d8] [formerly 7c91a83521 [formerly dab2af2df5] [formerly 4209e014d8] [formerly 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]]]
Former-commit-id: 79015595ee
Former-commit-id: 4f488940de [formerly 9cf071338e] [formerly d2f613e06b0e271020b7c52b497bdf43641096be [formerly 1c51f0b5f2]]
Former-commit-id: 6ad58b90d9f06f52b93c2fbae3d6c2833346af16 [formerly 7e721fb860]
Former-commit-id: d9da19b7d2
|
2013-05-08 18:39:25 -05:00 |
|
Brad Gonzales
|
9ac62c4895
|
Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
added sequence delta script.
Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1
Former-commit-id: c7318522e1 [formerly 005c935be6] [formerly dc37712fda] [formerly c7318522e1 [formerly 005c935be6] [formerly dc37712fda] [formerly b75ef08190 [formerly dc37712fda [formerly 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95]]]]
Former-commit-id: b75ef08190
Former-commit-id: 2c2f7f7edf [formerly a21b495206] [formerly a9e91f46554d9caefb1866f0820680559c325801 [formerly 16f030294d]]
Former-commit-id: 2d564f9f951487593ec967d020cee8f30658ea64 [formerly 00c0f59b6b]
Former-commit-id: 4a086703ea
|
2013-04-16 14:44:06 -05:00 |
|
Steve Harris
|
b6db7821fa
|
13.3.1-19 baseline
Former-commit-id: 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly 196767d525 [formerly dc9fef33a9] [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]]
Former-commit-id: abaf9f12f9
Former-commit-id: fe5020d315 [formerly ed4150db5f] [formerly afa8971d2a4b49801835997c9e04d909cbb5917c [formerly 340a2cfb23]]
Former-commit-id: 8178539bb83f1e27afa01a5dd82705a3f18fc420 [formerly 7d76371536]
Former-commit-id: 7b7efd0bd1
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|