Ron Anderson
|
6277338923
|
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: 217e4e7ba5 [formerly 916e607254] [formerly 1108744b40] [formerly 217e4e7ba5 [formerly 916e607254] [formerly 1108744b40] [formerly 22d67fcad1 [formerly 1108744b40 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]]
Former-commit-id: 22d67fcad1
Former-commit-id: c3c6922ca9 [formerly 808254cd31] [formerly d4135f29979a9a7a46bf93cbfb0448b5916e82d3 [formerly 33abe4a8d3]]
Former-commit-id: fd2ba64516f8f24b1dccef988173407320b01d1d [formerly ecaa8ab0a9]
Former-commit-id: 14f0f927bf
|
2014-05-30 10:47:28 -05:00 |
|
Ron Anderson
|
4c8754f963
|
Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: 2dec43f246 [formerly ce4047869c] [formerly a9f3b486f3] [formerly 2dec43f246 [formerly ce4047869c] [formerly a9f3b486f3] [formerly 8e1f4331da [formerly a9f3b486f3 [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4669662fd9 [formerly 4d32cb561d] [formerly 654ed9178d63556b1133e4a0292cb347f920a036 [formerly f765c74e5e]]
Former-commit-id: e76c485f2f8d98e7e56b4624ca020b2e690ecf56 [formerly 114532dd8d]
Former-commit-id: 0c06544416
|
2014-05-29 16:55:02 -05:00 |
|
Ron Anderson
|
fb8e1e58ce
|
Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: aabc6e4fa4 [formerly 17da90e8db] [formerly 4633de4ea3] [formerly aabc6e4fa4 [formerly 17da90e8db] [formerly 4633de4ea3] [formerly b7271025f9 [formerly 4633de4ea3 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]]]
Former-commit-id: b7271025f9
Former-commit-id: 22a49335df [formerly 3e5acbf168] [formerly dff7778150c988782c4a53e9f37ff7197bd54d3d [formerly f2733999de]]
Former-commit-id: 5d7d6fc51a102e81f0fa290cf5c214633a85a5aa [formerly b6b463682f]
Former-commit-id: 1f4bde25d9
|
2014-05-28 10:09:12 -05:00 |
|
Steve Harris
|
6281b0148d
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]]
Former-commit-id: 048d3748b7
Former-commit-id: 5469a5e863 [formerly 005e5b4ee2] [formerly 07a1965ea47f8ad30b0325329a0a7da148a19824 [formerly 4ed44b6e72]]
Former-commit-id: 84d3011f8d7a6ba7981aad3e8439f3e517ebf403 [formerly 95462b4f80]
Former-commit-id: 1f24080b8e
|
2014-05-28 07:41:42 -05:00 |
|
Steve Harris
|
cf2950abdb
|
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: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
|
2014-05-27 14:48:24 -04:00 |
|
Steve Harris
|
2118803e86
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 74c5b0454c [formerly 0a3b23d055] [formerly 4899c4f56a] [formerly 74c5b0454c [formerly 0a3b23d055] [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: aa266f6ded [formerly 805aae1a70] [formerly 075083683c45c73e61f607291d9d32a3cc865f27 [formerly 0df4af413b]]
Former-commit-id: ef4132ffa26246b1912b6d1234a3a9d9d473e8aa [formerly e7e48b2abb]
Former-commit-id: 5aca60f422
|
2014-05-22 14:05:06 -05:00 |
|
Ron Anderson
|
6fa737a051
|
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: 0e02e83629 [formerly b794dd04e1] [formerly 3b404f4083] [formerly 0e02e83629 [formerly b794dd04e1] [formerly 3b404f4083] [formerly 809548b283 [formerly 3b404f4083 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]]
Former-commit-id: 809548b283
Former-commit-id: f80e9822d5 [formerly fd6e80dd27] [formerly c78c2ff04c4d5c9559341c2f0e958d54366110f4 [formerly 029201d4b9]]
Former-commit-id: cd13fa3b4f04702ca8feffa0cdc0dff76b7311b3 [formerly 3f20fc86df]
Former-commit-id: 31da20ef5b
|
2014-05-20 11:10:26 -05:00 |
|
brian.dyke
|
5c9495ee04
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
0febfec9e7
|
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: 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly 8c0709798d [formerly f38d0138e6] [formerly 627541512d] [formerly d3fa10028c [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]]
Former-commit-id: d3fa10028c
Former-commit-id: a6b42a776b [formerly b0837b4905] [formerly 91d88625eae6852df94fbb04133d89826c605aad [formerly 68f3a0169e]]
Former-commit-id: c54c6441e46c95271889db670ff46e1bedce8459 [formerly f87775928f]
Former-commit-id: 1d53f6d304
|
2014-05-14 16:08:16 -04:00 |
|
Matthew Howard
|
f2fda36e49
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 84f26ca9f5 [formerly 7b087f422d] [formerly 5a20085f32] [formerly 84f26ca9f5 [formerly 7b087f422d] [formerly 5a20085f32] [formerly 576a2d63ec [formerly 5a20085f32 [formerly 2052df4ca5f68165b477994b21357c245ff73546]]]]
Former-commit-id: 576a2d63ec
Former-commit-id: 07372d5761 [formerly c919d3503a] [formerly 47aa58262f08efbcc70ce1e004c35606ebb7c410 [formerly 1026f04671]]
Former-commit-id: 900606d92eeface052fd5eb0751fd480fc46e5f6 [formerly 56778b394b]
Former-commit-id: 26c357a549
|
2014-05-13 07:49:18 -05:00 |
|
Zhidong.Hao
|
32dfe53122
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: 1f48dcab3c [formerly 30b42030dd] [formerly d6cae51207] [formerly 1f48dcab3c [formerly 30b42030dd] [formerly d6cae51207] [formerly 030b767299 [formerly d6cae51207 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]]]]
Former-commit-id: 030b767299
Former-commit-id: 79bdecf1b8 [formerly 31678eb223] [formerly 9d71f6e714e3aecf1dd6c690b838b59429ab91c9 [formerly 88c5e2d94c]]
Former-commit-id: 0437116819d26dce5a01e1304b4c62391d0a1a24 [formerly 6dd1289c31]
Former-commit-id: af44604e04
|
2014-05-12 15:16:38 -04:00 |
|
Rici.Yu
|
c101147b8c
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: c9e0740060 [formerly 34069a96be] [formerly 2ea1c1fa60] [formerly c9e0740060 [formerly 34069a96be] [formerly 2ea1c1fa60] [formerly 96d1555012 [formerly 2ea1c1fa60 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]]]
Former-commit-id: 96d1555012
Former-commit-id: 237d3d1249 [formerly 0ba9da16b0] [formerly 1917255ce7d9dff6758c55dc0869f28d43c5070c [formerly 473496b99a]]
Former-commit-id: 33b42e5229aac92fa57d985e21bd931b43ad96bd [formerly be10c8d49c]
Former-commit-id: 120a23223b
|
2014-05-12 13:38:04 -04:00 |
|
David Gillingham
|
0de3daedfb
|
Issue #3105: Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f8e5a17f3f [formerly 850eecb1b9] [formerly aa78ed1b69] [formerly f368412ef2 [formerly aa78ed1b69 [formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]]
Former-commit-id: f368412ef2
Former-commit-id: 2f1d7aeecd [formerly 3c4ee53300] [formerly f5f983e70edc8e09841a2c25cb10ec9abc9bffb2 [formerly b3a859fe39]]
Former-commit-id: 50c20dae3ab7e945eaa90db92077559d66ce1ed0 [formerly 64bd4b81dc]
Former-commit-id: da652d1c4a
|
2014-05-01 16:19:51 -05:00 |
|
Ron Anderson
|
70dacd1553
|
Issue #3097 Fix return type for SmartScript.getGrids()
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly 613aa1e94a [formerly 374e8224f1 [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 5954a74787 [formerly 9bcd5d3f4a] [formerly 6210770d82431a108e71b3e2243051996167dc6d [formerly 8ba17da4df]]
Former-commit-id: 52d4a5cb088bfe7fe78ec51c870946dd048722c1 [formerly 453065268c]
Former-commit-id: 6fe1a0d1b7
|
2014-04-30 17:26:57 +00:00 |
|
Richard Peter
|
e748b7c1e5
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
19b4bb7dcc
|
Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
|
2014-04-25 11:06:11 -04:00 |
|
Brian.Dyke
|
83dce492e5
|
Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 05c0e1ad1c [formerly 953236aad8] [formerly cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17]]
Former-commit-id: 76c73f256e229c073a4ca79c01bc6c9e1abe965a [formerly 26cb172a04]
Former-commit-id: 2161c569ea
|
2014-04-23 14:05:50 -04:00 |
|
Brian.Dyke
|
143d9a143a
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly 735801a7e7 [formerly 9df6fb2d4d] [formerly 12a482e1d7] [formerly b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]]
Former-commit-id: b8829139a2
Former-commit-id: 9c4385efbe [formerly 6f35818917] [formerly 007cb5daf20362de356dbfbefce51ee972d9ab3a [formerly 0ea7c51ad7]]
Former-commit-id: 286e1b30c773c91540e1e54ed0825014dadb3b10 [formerly a925ba6219]
Former-commit-id: de500c093f
|
2014-04-17 14:42:35 -04:00 |
|
Nate Jensen
|
0382243dfe
|
Issue #3039 fix ifpImage class cast exception
Former-commit-id: 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 68d61fe16b [formerly a5edace073] [formerly 2b6db445c0] [formerly 31fb61e824 [formerly 2b6db445c0 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]]
Former-commit-id: 31fb61e824
Former-commit-id: 17544a32ba [formerly 19f0be6afc] [formerly ab6962b9080189e0cbac802398d99762ae5982e2 [formerly a1dd7f24fa]]
Former-commit-id: 59458bd25850cd5eb277eabb12c6fc5b515b5cb1 [formerly 7e7bbfd784]
Former-commit-id: 64e7ac4225
|
2014-04-16 16:17:05 -05:00 |
|
Nate Jensen
|
805ff08819
|
Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin
Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a
Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]]
Former-commit-id: ceec3d48f0
Former-commit-id: 134f34c4df [formerly dfe50ee038] [formerly d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]]
Former-commit-id: 3e07e40b8dcad3da2eb07fe1e1fd1960476568c1 [formerly 1e5433c9c3]
Former-commit-id: c8c25d9224
|
2014-04-14 14:28:11 -05:00 |
|
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 |
|
Brian.Dyke
|
f77319aa5b
|
Merge branch 'master_14.1.2_to_master_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline into master_14.2.1
Former-commit-id: b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly b6e4e23394 [formerly 73be1016c0] [formerly 8c2f601b59] [formerly 9cce8eb0d1 [formerly 8c2f601b59 [formerly 4e5541582b38abcd744cf25549d007c9e8f1a104]]]]
Former-commit-id: 9cce8eb0d1
Former-commit-id: 70e228a893 [formerly afc1da9015] [formerly 460c0f2c903a9254ae079d95afd674824e6d6212 [formerly ff51498036]]
Former-commit-id: 9404d535e7a6fa45f9825f9c281883c24eedc7c4 [formerly f051b95a7a]
Former-commit-id: fbefee3e1d
|
2014-04-10 13:26:42 -04:00 |
|
David Gillingham
|
cb52793865
|
Issue #3004: Move ClearPracticeVTECTableRequest and its handler from gfe to activetable plugin.
Change-Id: I46b1d79f1b6602254febff5d7c3d8f655a22bf2d
Former-commit-id: 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly 41393ac5a1 [formerly 1c7e650e6a] [formerly c8a6dc8769] [formerly da31ab2042 [formerly c8a6dc8769 [formerly 6c5e65e538e145d31c84d2f81f7b41202ae41ad0]]]]
Former-commit-id: da31ab2042
Former-commit-id: 969dccd366 [formerly 0385a4395e] [formerly cb9962190ec6d166cbb1fc49f2bf0444ee77d9c4 [formerly 72229cfb94]]
Former-commit-id: fc3f96a9df8963b4b0cfcf9e1a139bf208111b7b [formerly 89046665f6]
Former-commit-id: 2ab21ac335
|
2014-04-10 11:24:40 -05:00 |
|
Richard Peter
|
52a54f5e9f
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly efd1003a50 [formerly 5676090443] [formerly 95eba8dcf6] [formerly b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]]]
Former-commit-id: b15d288530
Former-commit-id: 47795836f2 [formerly f1b85f6964] [formerly 12e55bf5c019cdd33ebe8c550d444fb3e73016ff [formerly 73aab15d85]]
Former-commit-id: 3660d57b987b8ab590b095e98b193f3d1ff95669 [formerly b667e0509f]
Former-commit-id: 421b2716a4
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
38a8f60a43
|
Merged 1354 -7 and -8 into 1412
Former-commit-id: 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 7de936dfba [formerly e4136f79dd] [formerly 947194c998] [formerly 929b736038 [formerly 947194c998 [formerly 082b54dc10676b7090f8a1c9a01929a6d7da2667]]]]
Former-commit-id: 929b736038
Former-commit-id: a6ebdbfc3a [formerly d76d3a26cb] [formerly ef99224ab38fbdf6c62ed3f358f4c50051cbc248 [formerly 5163a31a66]]
Former-commit-id: 281a7b2833a1dc51969eab1f2b614dfd6fa8f7eb [formerly 462952ce65]
Former-commit-id: 8ef50f023b
|
2014-04-09 11:39:07 -04:00 |
|
Brian.Dyke
|
ae3f5dbff6
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly 2eec862ebb [formerly 17477e7db1] [formerly 6a28fcb156] [formerly dd98c213c7 [formerly 6a28fcb156 [formerly 407b42b0eff676a95483e219d6be899e45effd6c]]]]
Former-commit-id: dd98c213c7
Former-commit-id: 8ba2694d8e [formerly 47d9095211] [formerly 637b118d4cff6a2a054282ce2aabc47a5819c54c [formerly 9f37f61cf8]]
Former-commit-id: a50a2cebaea771c45178ef7f0d701260c24962c6 [formerly be574897cc]
Former-commit-id: 39b5e7fe67
|
2014-04-04 12:57:32 -04:00 |
|
Ron Anderson
|
3936bcaf65
|
Merge "Issue #2737 Make iscMosaic remove data from ISC when grids are deleted." into development
Former-commit-id: d4d7e81799 [formerly 83d660cf2e] [formerly 2042d975c2] [formerly d4d7e81799 [formerly 83d660cf2e] [formerly 2042d975c2] [formerly debde74356 [formerly 2042d975c2 [formerly 93c224f21b0aec4eef0eaf0f57c5f48237c68265]]]]
Former-commit-id: debde74356
Former-commit-id: bb12a4b904 [formerly c3a4664534] [formerly 108d722236ee29849900176e85dc9365b6df27dd [formerly d4fabcc4b1]]
Former-commit-id: d95b981e70d3c0b2174f3e3b70a68d535bf2b492 [formerly 8f487dd5dc]
Former-commit-id: e1fc1365af
|
2014-04-04 08:35:12 -05:00 |
|
Ron Anderson
|
725dfcaa99
|
Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.
Change-Id: Ibf1255244b6e5856b5052e541727d427b331d9fe
Former-commit-id: 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly 700d2ba37f [formerly 51bb7f474d] [formerly 01ab6ce52d] [formerly ea250a253f [formerly 01ab6ce52d [formerly 5db8738783d79e8a48bfffac49910cc46df61ad2]]]]
Former-commit-id: ea250a253f
Former-commit-id: 1c032ab6f0 [formerly 4d9d2f59aa] [formerly 11feb3f28beaaea54d7cf1c0af9fce201f9ec319 [formerly de50c5e47d]]
Former-commit-id: 5dcab0023593976bafa739a23acb671a15943281 [formerly 9e568e1749]
Former-commit-id: 1e9e4479c8
|
2014-04-03 16:56:36 -05:00 |
|
Ron Anderson
|
de22018c08
|
Merge "Issue #2961 Fixed issue where ISC grids are selected based on the start time of the Fcst and not the grid that overlaps the spatial editor time." into development
Former-commit-id: 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 946a3857f9 [formerly 39bcb64c7f] [formerly 90429229f7] [formerly 52c2092e1c [formerly 90429229f7 [formerly 4e57b93f72b9e73a4ac2e1205393b3cae8e21958]]]]
Former-commit-id: 52c2092e1c
Former-commit-id: 11df67c9f4 [formerly 3e144c80a6] [formerly 6fa5ea130dedea2082686ac70b1f9913fc8f6110 [formerly 2bee12cb02]]
Former-commit-id: 5866f3a4adb0d8c3941128fe1565561cff073d1d [formerly 0b3850d11a]
Former-commit-id: e3b7e2a24a
|
2014-04-03 14:27:41 -05:00 |
|
Ron Anderson
|
29024b161e
|
Issue #2961 Fixed issue where ISC grids are selected based on the start time of the
Fcst and not the grid that overlaps the spatial editor time.
Change-Id: Ifb89fc1305db8a654067185064c3d570dfecd3b2
Former-commit-id: 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly 660bc974e9 [formerly a9be0658e4] [formerly eb90c1f216] [formerly db080f3eba [formerly eb90c1f216 [formerly 131f9c0933280d25f61458e270b5bb9715c2d67b]]]]
Former-commit-id: db080f3eba
Former-commit-id: 5d84747472 [formerly c880002b1e] [formerly f40c2938a553a6bd3809588d95bac2b3641d2765 [formerly c7b392e36b]]
Former-commit-id: 02d585704570326f08c96d5fae3b65c595dad235 [formerly 1e546a1fed]
Former-commit-id: fdb60c48d0
|
2014-04-03 13:04:55 -05:00 |
|
Ron Anderson
|
27d225d4a5
|
Merge "Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py" into development
Former-commit-id: dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly dd532a6edb [formerly bbecf3d2da] [formerly b67c36c08b] [formerly 822acbb32b [formerly b67c36c08b [formerly dc953f5285a2fb5c56148b78c5db31c4ccdda3a7]]]]
Former-commit-id: 822acbb32b
Former-commit-id: 2a0c06c814 [formerly b5680ce7f3] [formerly 2376fd5832ad8d1cfd61ec7ab3b9ba1df3cefd08 [formerly f7910616ca]]
Former-commit-id: 637dd659dc9349e6f757c7d9cc06d52e050fd572 [formerly 4309f32433]
Former-commit-id: 792a88f134
|
2014-04-03 12:57:16 -05:00 |
|
Ron Anderson
|
a30e21e0f8
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: I75d37583d15decaeb50db0d70fc0ba1f3a8a7b7c
Former-commit-id: 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 426d0fcdd7 [formerly bd7e411653] [formerly 11c8529862] [formerly 2abfe6de77 [formerly 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f]]]]
Former-commit-id: 2abfe6de77
Former-commit-id: f35fcf7c6f [formerly 8dcbe3a815] [formerly 2d2d6d92129690dc9335d9253ddd5235606cc9bd [formerly bd502fbe07]]
Former-commit-id: 892da9aec2fdbe7f3038c519708c65404c165f7a [formerly acb35f67ce]
Former-commit-id: 1afd3fb1a4
|
2014-04-03 12:42:42 -05:00 |
|
Ron Anderson
|
93acb60fdf
|
Merge "Issue #2847: Add option to export only selected parms to GFE KML export dialog." into development
Former-commit-id: 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 6d94c0be65 [formerly 6fa61adbd4] [formerly b61a1b346d] [formerly 60f3ad27e2 [formerly b61a1b346d [formerly 17ab17280bc6e4c990edec44a40f78f1f36f5ced]]]]
Former-commit-id: 60f3ad27e2
Former-commit-id: 048d7d363b [formerly 6f9cadafa7] [formerly 62d6e4880917155c00a538024e1217517051a84e [formerly d1e5fdd365]]
Former-commit-id: a22fb5a3a000eeff2e73a0ad000631b0f57569ff [formerly 5fb2f8e94d]
Former-commit-id: 746bc34cc6
|
2014-04-03 11:47:15 -05:00 |
|
David Gillingham
|
684be4ea5f
|
Issue #2847: Add option to export only selected parms to GFE KML export dialog.
Change-Id: I6f0111d0f8eaed302c18dcd08e4433a7e544e669
Former-commit-id: f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly f32b34b736 [formerly 7e165846d2] [formerly 965d76c139] [formerly 7f36b8ba9c [formerly 965d76c139 [formerly cdb6f07f0a514c159e792e3bb911ef93a8354b2d]]]]
Former-commit-id: 7f36b8ba9c
Former-commit-id: 87ce104d67 [formerly 9fcb3f6920] [formerly aa5f9f82bfce0e52bd621bb6427bfb10d3b1447a [formerly 017ea69812]]
Former-commit-id: e57b8ddc5b7e10e10f98897ec5b3cb133da1a9a4 [formerly 797f124905]
Former-commit-id: 0e67fffa35
|
2014-04-03 11:30:59 -05:00 |
|
Ron Anderson
|
360d0ba509
|
Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py
Change-Id: Ic01c265f792d855751aeac9890953600d531c12c
Former-commit-id: ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly ee8d561f81 [formerly 7e58a73dbf] [formerly 8da64048e7] [formerly 69cd6a1598 [formerly 8da64048e7 [formerly cfec08f8c4ac8552699e9387148ba2e9d0dc9558]]]]
Former-commit-id: 69cd6a1598
Former-commit-id: ec74556c48 [formerly b16405ecb3] [formerly ef0141d58da5e73da45520afce6c1175f7c71496 [formerly dde9253f15]]
Former-commit-id: 72d121851571db14da4879bf84985df48d304e87 [formerly b8e1eca066]
Former-commit-id: 5309dbf14c
|
2014-04-02 18:22:51 -05:00 |
|
Ron Anderson
|
38a1d957aa
|
Issue #2961 Code clean up. Issue was fixed under #2703
Added listener to redo time matching when ISC mode changes
Change-Id: Ic2a883c6255a81cac1316d268225fb6078921cb1
Former-commit-id: 82062553f0 [formerly 51ffcd7ce8] [formerly f4b31b336a] [formerly 82062553f0 [formerly 51ffcd7ce8] [formerly f4b31b336a] [formerly efb27793f4 [formerly f4b31b336a [formerly afbab6d1d0b4f1aad80e5a082f536f608f523380]]]]
Former-commit-id: efb27793f4
Former-commit-id: 8463514df0 [formerly c1e5e2fd18] [formerly 3dc1bbaea04ff0ad7927eabe00966a8cca040dc6 [formerly bfed3dc521]]
Former-commit-id: 35f76f0c3fa6a795124c70b69a2554a6171126b2 [formerly 6385c81420]
Former-commit-id: dfcdaadbe2
|
2014-04-02 16:55:02 -05:00 |
|
Ron Anderson
|
f60398861b
|
Issue #2969 Fixed error when Topo parm is unloaded.
Fixed check state of Topography menu item.
Change-Id: I3cd13d91b489425e05efd68fd6bbbfd9a9d3cd4b
Former-commit-id: 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly 4bb7f13198 [formerly 346984b8ab] [formerly 11fbd86558] [formerly d556055299 [formerly 11fbd86558 [formerly 3856ce7fc5c5ac85ca26e71da326457f0bb0b2b5]]]]
Former-commit-id: d556055299
Former-commit-id: 5001c1f2be [formerly 3ac3d5de1b] [formerly dec5605ca65dcc7794d7aa2a917294e93e71160b [formerly ac7c5460f6]]
Former-commit-id: 1dcb3833d22665a093272a2766e36a92adf65c41 [formerly 4e88052beb]
Former-commit-id: 0033d7d3ef
|
2014-04-02 09:07:22 -05:00 |
|
David Friedman
|
8ea6e0b064
|
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: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 1e4ac84f99 [formerly 1168a3eae5] [formerly 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]]
Former-commit-id: beb961d5304e2c2df6afc0538bae8011c8b6f63f [formerly dde12b4fc3]
Former-commit-id: 8f8f55dd3c
|
2014-03-27 19:17:03 +00:00 |
|
Rici.Yu
|
cd49835497
|
ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99
Former-commit-id: 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 777bd46d68 [formerly c559ade333] [formerly 74b1c827ee] [formerly 58f9857344 [formerly 74b1c827ee [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]]]]
Former-commit-id: 58f9857344
Former-commit-id: a3e865e011 [formerly e877c81c88] [formerly 8ff482b2584775bc71dc4df96949f7260608e124 [formerly 0ee8baf0c3]]
Former-commit-id: 679e5fa6043cfd72296cbdd819ff457a1c6da449 [formerly 1684740d02]
Former-commit-id: f32491f913
|
2014-03-14 14:39:56 -04:00 |
|
Ben Steffensmeier
|
fd2fbe839d
|
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 094086b5c2 [formerly c0b478eb97] [formerly 9122b6da99] [formerly 8650074737 [formerly 9122b6da99 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]]]]
Former-commit-id: 8650074737
Former-commit-id: bf5b777b0d [formerly 5e4c35e93f] [formerly b86eb15482eef7c6ed811b7be5a9d782dbcfa838 [formerly d3043fda5a]]
Former-commit-id: 97f709f323c3b2bc50eb72f596874288c2f388b5 [formerly a1ac082c94]
Former-commit-id: ad4ce67e85
|
2014-03-07 18:15:32 -06:00 |
|
Steve Harris
|
9c0f484340
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
3348f6857a
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly da2d7fc334 [formerly 068297b90a] [formerly 92232fa063] [formerly 40b543f9a8 [formerly 92232fa063 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]]]]
Former-commit-id: 40b543f9a8
Former-commit-id: a94f800324 [formerly 4d1fbf8743] [formerly b74d7aa4530a565aa9b8f8596b6981c8ead91adb [formerly f992a6b046]]
Former-commit-id: 0b70d2b7739772b630136c56408866dc53a2bdcd [formerly ea01373320]
Former-commit-id: e29b96b6bd
|
2014-03-07 15:16:18 -06:00 |
|
Steve Harris
|
a19beb1e5d
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
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.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
|
2014-03-06 08:39:43 -06:00 |
|
Max Schenkelberg
|
bee18f29d0
|
Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada
Former-commit-id: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]]
Former-commit-id: 1854bbb477
Former-commit-id: c37910a689 [formerly bff80c3ee9] [formerly 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]]
Former-commit-id: ac56a95b831199d75f4f7799c88a6cd9f119118f [formerly 96bdc00728]
Former-commit-id: 83103254e7
|
2014-03-03 17:59:48 -06:00 |
|
Nate Jensen
|
7d45344d05
|
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]]
Former-commit-id: 908d308825
Former-commit-id: 7ab7887199 [formerly fb68c4c07f] [formerly f763c6864aae7276537781234c118f3f876d018c [formerly 92527f1ffa]]
Former-commit-id: d76199bbbc5e0ea0744302003f49e6eeedb80d16 [formerly f0bb217f04]
Former-commit-id: 4e66e5bcc5
|
2014-02-28 09:53:27 -06:00 |
|
Richard Peter
|
ef2ff1d0f7
|
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: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 1d6e9816e0 [formerly 50a1b270c5] [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]]
Former-commit-id: 1916128dada6d785b45f3c66eda571278ddb03d7 [formerly 9b3f8f9649]
Former-commit-id: 5fab51d41b
|
2014-02-27 15:18:26 -06:00 |
|
Ben Steffensmeier
|
0de5a55243
|
Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 66b052cd5a [formerly 0fde78c595] [formerly 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6]]
Former-commit-id: e3dfae5839ecf10e3241d25f087585ecf760940a [formerly 6843396c78]
Former-commit-id: d899433612
|
2014-02-26 14:45:19 -06:00 |
|
Brian.Dyke
|
9db7ca881a
|
Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7
Former-commit-id: 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 9158806dd2 [formerly 363403fb34] [formerly 2faab606e5] [formerly 1a8a0b703e [formerly 2faab606e5 [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 6b1b6d38e3 [formerly 73a1c238f4] [formerly c32d7953dc94373551f79bad9831cf9ef8cced7c [formerly 227131e5f1]]
Former-commit-id: b22adde77eff6179b00b4c7389d58bbde1684f4b [formerly 38829b9014]
Former-commit-id: 0bcf7c89b8
|
2014-02-24 14:51:00 -05:00 |
|
Ron Anderson
|
5eb76e8ed6
|
Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962
Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]]
Former-commit-id: 2db5f26840
Former-commit-id: 5831f8d79e [formerly 7d3af157f8] [formerly a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]]
Former-commit-id: 50ec6dfad53c87f1ad4174e64fdb142803fcaf62 [formerly f2b0cc20e8]
Former-commit-id: 3c673caec2
|
2014-02-24 13:46:48 -06:00 |
|
Brian.Dyke
|
de9e6553a9
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
|
2014-02-21 06:50:59 -05:00 |
|