Max Schenkelberg
a2e7d1324f
Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication
...
Change-Id: Iccaa6d95ec47fa41080929e456ff450eb61f41eb
Former-commit-id: 422ceffbdd
[formerly 3ea9b1b4be
] [formerly 422ceffbdd
[formerly 3ea9b1b4be
] [formerly 994605c1ce
[formerly 154c4ac7131ae8f533d4080055d9afe257bf0506]]]
Former-commit-id: 994605c1ce
Former-commit-id: 165583b144
[formerly 3b1a3f84fd
]
Former-commit-id: 144e042b42
2014-09-10 15:43:19 -05:00
Chris Cody
97d6b67891
Omaha #3365 Removing and realigning AWIPS2 Baseline tests
...
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48
Former-commit-id: 39887a4b9c
[formerly f4445d24cd
] [formerly 39887a4b9c
[formerly f4445d24cd
] [formerly 9e823a47d6
[formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]]
Former-commit-id: 9e823a47d6
Former-commit-id: 62780e001b
[formerly 57c689eee6
]
Former-commit-id: 0564fa8bf9
2014-09-05 10:14:14 -05:00
Ben Steffensmeier
5b35e526f4
Omaha #3390 Remove references to deprecated API.
...
Former-commit-id: 950075dc59
[formerly 1d2144e840
] [formerly 950075dc59
[formerly 1d2144e840
] [formerly e32037b42a
[formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: e32037b42a
Former-commit-id: 068653ac95
[formerly b77166c26e
]
Former-commit-id: 6e1981d6f6
2014-09-02 15:39:45 -05:00
Ron Anderson
c13e748b6c
Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
...
Former-commit-id: 8d9741bd83
[formerly 6a5d4acf7c
] [formerly 8d9741bd83
[formerly 6a5d4acf7c
] [formerly aa6835147b
[formerly 31578a50044053da2ecf14697764bfac2ee8ac8d]]]
Former-commit-id: aa6835147b
Former-commit-id: f27986f541
[formerly 017378f646
]
Former-commit-id: 8ab30a7e02
2014-09-02 12:08:44 -05:00
Mark Peters
aa58dab103
Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
...
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473
Former-commit-id: 966879b8a1
[formerly e35a7451c6
] [formerly 966879b8a1
[formerly e35a7451c6
] [formerly 045746ec21
[formerly 8099cbe2359334d6718761046a1475fca687af35]]]
Former-commit-id: 045746ec21
Former-commit-id: c850f6b6cd
[formerly cc96e1fb1f
]
Former-commit-id: 264c5afa15
2014-08-29 16:17:22 -05:00
Ron Anderson
4a821c89b7
Omaha #3459 Ensure font is initialized before queryJob runs,
...
Additional refactoring to someday allow ZoneSelectorResource to use more common code.
Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062
Former-commit-id: f3f2ec8843
[formerly 8583386e5f
] [formerly f3f2ec8843
[formerly 8583386e5f
] [formerly de490ea582
[formerly a1896437f432bcb360365d28a0ee7377cec565af]]]
Former-commit-id: de490ea582
Former-commit-id: ae69665e50
[formerly 338672c03f
]
Former-commit-id: 3954787487
2014-08-29 12:04:52 -05:00
Ron Anderson
acc6079444
Omaha #3561 Yet another attempt to fix combinations file updating
...
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 89cde78ea6
[formerly bd52b5a924
] [formerly 89cde78ea6
[formerly bd52b5a924
] [formerly 9f37d7914a
[formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]
Former-commit-id: 9f37d7914a
Former-commit-id: b58479dc0b
[formerly b489928744
]
Former-commit-id: 7158207736
2014-08-29 10:45:54 -05:00
Ron Anderson
932d9e2783
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
...
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: dc185b8dd1
[formerly bb1e80b844
] [formerly dc185b8dd1
[formerly bb1e80b844
] [formerly 2b88ade974
[formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]
Former-commit-id: 2b88ade974
Former-commit-id: 39d00a72ce
[formerly 0962c75d18
]
Former-commit-id: 56b56ea4f3
2014-08-28 10:43:54 -05:00
Ron Anderson
eede0b99c3
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
...
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 56b553ad0d
[formerly 8434195c57
] [formerly 56b553ad0d
[formerly 8434195c57
] [formerly 606e2b210c
[formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]]
Former-commit-id: 606e2b210c
Former-commit-id: 6c38d4f143
[formerly fda5c981f9
]
Former-commit-id: 7799092b08
2014-08-25 12:39:58 -05:00
Ron Anderson
8a9d464a81
Omaha #1664 Fixed invalid thread access in several GFE dialogs
...
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3
Former-commit-id: a9d580647e
[formerly 4178dac741
] [formerly a9d580647e
[formerly 4178dac741
] [formerly bb124e7fa2
[formerly 93aa457f4918cd16edd21422819cda12af26250f]]]
Former-commit-id: bb124e7fa2
Former-commit-id: ca2f709ce1
[formerly ff31c11e02
]
Former-commit-id: 1cabf1b3cd
2014-08-21 09:25:14 -05:00
Mark Peters
d63684feaa
Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
...
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f
Former-commit-id: f6799659ea
[formerly 308ada356b
] [formerly f6799659ea
[formerly 308ada356b
] [formerly 4011a4392c
[formerly e409b578fcb15caadf28da57d2cb1860e1ea246c]]]
Former-commit-id: 4011a4392c
Former-commit-id: c36257683c
[formerly 03229efe86
]
Former-commit-id: b7209bee6e
2014-08-14 15:43:17 -05:00
Nate Jensen
7336692b85
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
...
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 253198b5bc
[formerly b3083a663e
] [formerly 253198b5bc
[formerly b3083a663e
] [formerly 9b72a1399d
[formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]
Former-commit-id: 9b72a1399d
Former-commit-id: 58a4cb95c1
[formerly d67083655a
]
Former-commit-id: 951feab33d
2014-08-14 10:22:37 -05:00
Mark Peters
019a89bcaf
Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape()
...
Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313
Former-commit-id: 1d0983cd4a
[formerly 58dd0873e3
] [formerly 1d0983cd4a
[formerly 58dd0873e3
] [formerly 8e7d6964c6
[formerly 0df04ef8a5b4eee4398a411fc02baba22f719eaf]]]
Former-commit-id: 8e7d6964c6
Former-commit-id: 4ca6e07182
[formerly c823ff5bc3
]
Former-commit-id: 824ebff454
2014-08-13 12:22:47 -05:00
Nate Jensen
7a7fa85742
Merge "Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui since those plugins don't even have buddy policies" into omaha_14.4.1
...
Former-commit-id: a6ac3609a9
[formerly 0873be5eac
] [formerly a6ac3609a9
[formerly 0873be5eac
] [formerly 69a7955015
[formerly 4e837f409cdc55d597b8fcd019381353a5bd5b29]]]
Former-commit-id: 69a7955015
Former-commit-id: ff6775a9dc
[formerly 936e7d5d81
]
Former-commit-id: f16219cf0f
2014-08-05 10:33:29 -05:00
Steve Harris
a0fdc76880
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: a92dc418c6
[formerly 0fb743ec44
] [formerly a92dc418c6
[formerly 0fb743ec44
] [formerly bf9a0fa5de
[formerly f7d474895366eb23ae5eef242a4568f911435aa3]]]
Former-commit-id: bf9a0fa5de
Former-commit-id: b848e05aa1
[formerly 46fe792d83
]
Former-commit-id: 5e2f7a9f74
2014-08-04 22:20:29 -05:00
Nate Jensen
875a4ae026
Omaha #3356 remove registering buddies to viz.volumebrowser and viz.ui
...
since those plugins don't even have buddy policies
Change-Id: Ib81ac30111b9c3020e486d6db52dde3e15d7dacf
Former-commit-id: 92b1fb11e5
[formerly 6e94ea9d2b
] [formerly 92b1fb11e5
[formerly 6e94ea9d2b
] [formerly f8d9235104
[formerly 4f691341c0368c3e015c73f25aab0cf8877802ac]]]
Former-commit-id: f8d9235104
Former-commit-id: 8e6d26df88
[formerly 619f0ac245
]
Former-commit-id: 2889a0fedb
2014-08-04 18:03:15 -05:00
Mark Peters
7a4c25190e
Omaha #3471 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createShadedShape()
...
Change-Id: Iea874ecfa2c7f16eacdc7f097039ba20f10fc2b9
Former-commit-id: 9be02c8dfe
[formerly 22c077d77f
] [formerly 9be02c8dfe
[formerly 22c077d77f
] [formerly 88b334cf14
[formerly 4bcf01e33f1d2e038499fdece63e81b6288b7152]]]
Former-commit-id: 88b334cf14
Former-commit-id: 469f73cb43
[formerly 666c988f64
]
Former-commit-id: ca4003ca7f
2014-08-04 13:27:45 -05:00
Brian.Dyke
803ceadaec
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.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
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 301f3094be
[formerly 9abb02ea8a
] [formerly 301f3094be
[formerly 9abb02ea8a
] [formerly 270d2b0ddb
[formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50
[formerly 37aacfcb96
]
Former-commit-id: b9daa26f7d
2014-08-04 13:10:13 -04:00
Mark Peters
011ef40360
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
...
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: 11abefd4de
[formerly 437e127ebc
] [formerly 11abefd4de
[formerly 437e127ebc
] [formerly bac12d844b
[formerly a222b29ff24bf81d1c8aefd54fa33f52461c9c25]]]
Former-commit-id: bac12d844b
Former-commit-id: 95886b5ded
[formerly 6edd39cc9e
]
Former-commit-id: baecaaaca0
2014-07-29 11:20:53 -05:00
Steve Harris
bd9067626f
Merge branch 'omaha_14.4.1' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: a893b9b08a
[formerly 05de3fbe54
] [formerly a893b9b08a
[formerly 05de3fbe54
] [formerly a43ffbe052
[formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]]
Former-commit-id: a43ffbe052
Former-commit-id: 6920a273e5
[formerly 202c1a0316
]
Former-commit-id: 7bf6b4de06
2014-07-14 12:08:09 -05:00
Nate Jensen
ed4cfdb1f3
Omaha #3361 reduce number of extraneous localization requests at GFE
...
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: c3bd61a2c0
[formerly 0c397d2b7e
] [formerly c3bd61a2c0
[formerly 0c397d2b7e
] [formerly 5547ea1c7d
[formerly efa10ca2702ecee4535711be06373e5d079ac117]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: d5f944d203
[formerly af08cc189f
]
Former-commit-id: 9931cfdf84
2014-07-09 09:24:31 -05:00
Ron Anderson
a1a980ed6e
Issue #3332 Fixed race condition which could cause GFE grid saving to hang
...
Change-Id: I4a2ef9e25999d95ac1ecf204907c59b2f1e85652
Former-commit-id: 4b4629a2fd
[formerly 111b04296c
] [formerly 4b4629a2fd
[formerly 111b04296c
] [formerly 5efba03474
[formerly b01b72b896b894568acce6a8dc4d45328a06067a]]]
Former-commit-id: 5efba03474
Former-commit-id: e39615ab7a
[formerly 1cc0ff4ab7
]
Former-commit-id: 0a7c4c855e
2014-07-09 08:56:06 -05:00
Ron Anderson
6935f82cfa
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
...
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: fd16321f82
[formerly 8d50f9d15a
] [formerly fd16321f82
[formerly 8d50f9d15a
] [formerly 24faa48233
[formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]]
Former-commit-id: 24faa48233
Former-commit-id: ae401db2ab
[formerly 87664d86a5
]
Former-commit-id: 9a873532ad
2014-07-07 09:02:14 -05:00
Richard Peter
342192e967
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 6636b301e5
[formerly 93bbd98cbc
] [formerly 6636b301e5
[formerly 93bbd98cbc
] [formerly 8ecc27f714
[formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 552ac6d640
[formerly fc27824dbc
]
Former-commit-id: 0fefdc7cd6
2014-07-01 15:34:39 -05:00
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
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
Nate Jensen
1b2612e117
Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1
...
Former-commit-id: bd2ef07395
[formerly d8dc6eceef
] [formerly bd2ef07395
[formerly d8dc6eceef
] [formerly acd7620d7a
[formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]]
Former-commit-id: acd7620d7a
Former-commit-id: fe52a8f7f8
[formerly 485aced54c
]
Former-commit-id: 479ccb41f4
2014-06-17 14:21:55 -05:00
Ron Anderson
f2c24187a2
Omaha #3110 Fix typos in revision comment and log message.
...
Changed to log number of messages in queue instead of number being added to queue.
Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7
Former-commit-id: 404098d861
[formerly b7843361f6
] [formerly 404098d861
[formerly b7843361f6
] [formerly 1a8ccd0181
[formerly 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527]]]
Former-commit-id: 1a8ccd0181
Former-commit-id: ed318889de
[formerly e31eabe77b
]
Former-commit-id: 2728191963
2014-06-17 13:46:38 -05:00
Nate Jensen
54b72c7108
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 14a520dbd9
[formerly 4a91c3320b
] [formerly 14a520dbd9
[formerly 4a91c3320b
] [formerly 44cb0e6ae6
[formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: 439e037d03
[formerly 3981241355
]
Former-commit-id: fe47ecf6ce
2014-06-17 10:54:57 -05:00
Steve Harris
a0d17947a9
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: 97843cf58e
[formerly 9213369739
] [formerly 97843cf58e
[formerly 9213369739
] [formerly e1c8ad2611
[formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]
Former-commit-id: e1c8ad2611
Former-commit-id: d7cd0ac02c
[formerly 362988b9d7
]
Former-commit-id: 8270fd8a9f
2014-06-16 08:19:12 -05:00
Brian.Dyke
3da13f3d12
CM-MERGE:OB13.5.6-3 into 14.1.3
...
Former-commit-id: 5064d24e26
[formerly 346bf852cd
] [formerly 5064d24e26
[formerly 346bf852cd
] [formerly 81832d97e5
[formerly df99fcb0a4be27d5f2d22935847fb55b8bfbbb58]]]
Former-commit-id: 81832d97e5
Former-commit-id: 764b729546
[formerly 4bca0769fb
]
Former-commit-id: 766974a05d
2014-06-13 13:21:19 -04:00
brian.dyke
65f4a41200
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 789482b0e3
[formerly 79f866fb17
] [formerly 789482b0e3
[formerly 79f866fb17
] [formerly b3d95ca18d
[formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]]
Former-commit-id: b3d95ca18d
Former-commit-id: 05dfb0b2a5
[formerly 76cbdf64ff
]
Former-commit-id: 21721fd935
2014-06-03 16:14:16 -04:00
Ron Anderson
14f0f927bf
Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
...
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d
Former-commit-id: 916e607254
[formerly 1108744b40
] [formerly 916e607254
[formerly 1108744b40
] [formerly 22d67fcad1
[formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]
Former-commit-id: 22d67fcad1
Former-commit-id: 808254cd31
[formerly 33abe4a8d3
]
Former-commit-id: ecaa8ab0a9
2014-05-30 10:47:28 -05:00
brian.dyke
45dd00f016
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 2c2bb61e95
[formerly 95c5dc49c1
] [formerly 2c2bb61e95
[formerly 95c5dc49c1
] [formerly 03cc2fbbfb
[formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: b6623af1f7
[formerly e09bd1d283
]
Former-commit-id: 3f9ac5ba24
2014-05-30 10:09:00 -04:00
Ron Anderson
0c06544416
Omaha #2841 Separate queuing of text formatters and product scripts.
...
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8
Former-commit-id: ce4047869c
[formerly a9f3b486f3
] [formerly ce4047869c
[formerly a9f3b486f3
] [formerly 8e1f4331da
[formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4d32cb561d
[formerly f765c74e5e
]
Former-commit-id: 114532dd8d
2014-05-29 16:55:02 -05:00
Ron Anderson
1f4bde25d9
Omaha #3110 Permanent fix for mutable database creation.
...
Former-commit-id: 17da90e8db
[formerly 4633de4ea3
] [formerly 17da90e8db
[formerly 4633de4ea3
] [formerly b7271025f9
[formerly a0001c9ed3d414237069f43a29dd907111c16832]]]
Former-commit-id: b7271025f9
Former-commit-id: 3e5acbf168
[formerly f2733999de
]
Former-commit-id: b6b463682f
2014-05-28 10:09:12 -05:00
Steve Harris
1f24080b8e
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: a4825f4b27
[formerly 2c49d14c12
] [formerly a4825f4b27
[formerly 2c49d14c12
] [formerly 048d3748b7
[formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]
Former-commit-id: 048d3748b7
Former-commit-id: 005e5b4ee2
[formerly 4ed44b6e72
]
Former-commit-id: 95462b4f80
2014-05-28 07:41:42 -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
Steve Harris
5aca60f422
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: 0a3b23d055
[formerly 4899c4f56a
] [formerly 0a3b23d055
[formerly 4899c4f56a
] [formerly 2059fc9c0e
[formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 805aae1a70
[formerly 0df4af413b
]
Former-commit-id: e7e48b2abb
2014-05-22 14:05:06 -05:00
Matthew Howard
bcae526dc8
Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
...
Former-commit-id: 00e44aada9
[formerly 95b9746871
] [formerly 00e44aada9
[formerly 95b9746871
] [formerly e17f8a0082
[formerly 5893d06b990cec295338595b006a45bb762b4b73]]]
Former-commit-id: e17f8a0082
Former-commit-id: 56a231e0b0
[formerly 725fff1b13
]
Former-commit-id: eb700ea256
2014-05-22 07:50:50 -05:00
Zhidong.Hao
1b25474707
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
...
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: 2773af6884
[formerly bcdb0dba95
] [formerly 2773af6884
[formerly bcdb0dba95
] [formerly 77ac5458d0
[formerly d4be1e866c561717a9a7697b3ff451efdd184fe6]]]
Former-commit-id: 77ac5458d0
Former-commit-id: b529afd928
[formerly a65061a58f
]
Former-commit-id: 17a525443c
2014-05-21 09:15:41 -04:00
Ron Anderson
31da20ef5b
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b794dd04e1
[formerly 3b404f4083
] [formerly b794dd04e1
[formerly 3b404f4083
] [formerly 809548b283
[formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]
Former-commit-id: 809548b283
Former-commit-id: fd6e80dd27
[formerly 029201d4b9
]
Former-commit-id: 3f20fc86df
2014-05-20 11:10:26 -05:00
brian.dyke
b2e3c50ec0
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: 9626317825
[formerly 011d121e4b
] [formerly 9626317825
[formerly 011d121e4b
] [formerly 58683ad040
[formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d
[formerly bc4649765a
]
Former-commit-id: b42011fc76
2014-05-19 09:45:37 -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
Matthew Howard
26c357a549
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
...
Former-commit-id: 7b087f422d
[formerly 5a20085f32
] [formerly 7b087f422d
[formerly 5a20085f32
] [formerly 576a2d63ec
[formerly 2052df4ca5f68165b477994b21357c245ff73546]]]
Former-commit-id: 576a2d63ec
Former-commit-id: c919d3503a
[formerly 1026f04671
]
Former-commit-id: 56778b394b
2014-05-13 07:49:18 -05:00
Zhidong.Hao
af44604e04
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
...
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: 30b42030dd
[formerly d6cae51207
] [formerly 30b42030dd
[formerly d6cae51207
] [formerly 030b767299
[formerly a48b81894fed165aba58a0097359bbd0f1931be5]]]
Former-commit-id: 030b767299
Former-commit-id: 31678eb223
[formerly 88c5e2d94c
]
Former-commit-id: 6dd1289c31
2014-05-12 15:16:38 -04:00
Rici.Yu
120a23223b
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
...
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: 34069a96be
[formerly 2ea1c1fa60
] [formerly 34069a96be
[formerly 2ea1c1fa60
] [formerly 96d1555012
[formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]]
Former-commit-id: 96d1555012
Former-commit-id: 0ba9da16b0
[formerly 473496b99a
]
Former-commit-id: be10c8d49c
2014-05-12 13:38:04 -04:00
David Gillingham
da652d1c4a
Issue #3105 : Ensure ParmManager adds mutable db to internal db list if db is created during initialization.
...
Change-Id: I85de2a8182abcd0504ceee75076a3c7a72905daf
Former-commit-id: 850eecb1b9
[formerly aa78ed1b69
] [formerly 850eecb1b9
[formerly aa78ed1b69
] [formerly f368412ef2
[formerly 3d8a23e2e2802d19768de47c61cedb723ec53c8f]]]
Former-commit-id: f368412ef2
Former-commit-id: 3c4ee53300
[formerly b3a859fe39
]
Former-commit-id: 64bd4b81dc
2014-05-01 16:19:51 -05:00
Ron Anderson
6fe1a0d1b7
Issue #3097 Fix return type for SmartScript.getGrids()
...
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0
Former-commit-id: fcfd6e4c00
[formerly 374e8224f1
] [formerly fcfd6e4c00
[formerly 374e8224f1
] [formerly 613aa1e94a
[formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 9bcd5d3f4a
[formerly 8ba17da4df
]
Former-commit-id: 453065268c
2014-04-30 17:26:57 +00:00
Richard Peter
938e39a0fc
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: 67683dd891
[formerly 44b1782461
] [formerly 67683dd891
[formerly 44b1782461
] [formerly 32957285fc
[formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246
[formerly 80d4153878
]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00