Steve Harris
|
6900bb61c1
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
|
2014-09-29 12:58:56 -05:00 |
|
Zhidong.Hao
|
873e09a5f2
|
ASM #537 - fix for AvnFPS: Syntax failed to flag format error
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a
Former-commit-id: 396519b17a [formerly 237b09c2ad [formerly 52d355b81fd7f7376d26f43ca6abe4d2ee744adf]]
Former-commit-id: 237b09c2ad
Former-commit-id: 8fadf3bf2c
|
2014-09-17 15:02:13 -04:00 |
|
Brian Clements
|
d7defbe7ca
|
Omaha #3502 common.util changes
moved ConvertUtil, reworked StringUtil.split()
Change-Id: I82114f8a9ec7fb907c85258a070169dcba61be03
Former-commit-id: fc322a74b2 [formerly c3e1b5c9a2 [formerly 72b5092e87e71f78fa35065dfc8bcb8e746f67b8]]
Former-commit-id: c3e1b5c9a2
Former-commit-id: 4d3bb07573
|
2014-08-07 16:48:57 -05:00 |
|
Roger Ferrel
|
a961faca0d
|
Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 42fe1bf5b2 [formerly 960772ea44 [formerly 787261f13c47b5de81b2e7c4f861645614a11f1f]]
Former-commit-id: 960772ea44
Former-commit-id: 09ae36d8de
|
2014-06-12 10:08:51 -05:00 |
|
Roger Ferrel
|
cb5070f384
|
Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5
Former-commit-id: 10e7a33f08 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]
Former-commit-id: e1c011b157
Former-commit-id: 7510cc23af
|
2014-06-04 08:14:06 -05:00 |
|
brian.dyke
|
4d161aaf90
|
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: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 011d121e4b
Former-commit-id: 9626317825
|
2014-05-19 09:45:37 -04:00 |
|
Zhidong.Hao
|
e8abed29cb
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 074713bb4a [formerly 8d560036b1 [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]
Former-commit-id: 8d560036b1
Former-commit-id: 29e7d7e888
|
2014-05-12 14:33:25 -04:00 |
|
Richard Peter
|
8b1a177110
|
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: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
|
2014-04-28 16:27:40 -05:00 |
|
Brian.Dyke
|
362d882b40
|
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: 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]
Former-commit-id: fb1f5aa593
Former-commit-id: f0b8ea5822
|
2014-04-25 11:06:11 -04:00 |
|
Ron Anderson
|
bf6d35aa0f
|
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: f3185dd206 [formerly 221a06e467 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]
Former-commit-id: 221a06e467
Former-commit-id: 2f68fb8f2c
|
2014-04-23 17:04:16 -05:00 |
|
Brian.Dyke
|
735801a7e7
|
Merged 14.2.1 -17, -18 into 1422-3
Former-commit-id: b8829139a2 [formerly 12a482e1d7 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]
Former-commit-id: 12a482e1d7
Former-commit-id: 9df6fb2d4d
|
2014-04-17 14:42:35 -04:00 |
|
Richard Peter
|
9b12d9ddaf
|
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: 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]
Former-commit-id: 3575d6586f
Former-commit-id: cd51f3fa87
|
2014-04-11 16:23:09 -05:00 |
|
Richard Peter
|
efd1003a50
|
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: b15d288530 [formerly 95eba8dcf6 [formerly 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2]]
Former-commit-id: 95eba8dcf6
Former-commit-id: 5676090443
|
2014-04-09 16:00:54 -05:00 |
|
Lee Venable
|
a700d23f6d
|
Issue #2925 - Fixed NPE found during testing.
Former-commit-id: 5b73c516d3 [formerly c29981fa99 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]
Former-commit-id: c29981fa99
Former-commit-id: cc7d240cfd
|
2014-03-21 12:42:13 -05:00 |
|
Max Schenkelberg
|
dbc6cc3fc6
|
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: a01a6d68d0
Former-commit-id: 59434c8a60
|
2014-03-04 09:23:36 -06:00 |
|
brian.dyke
|
becf6322c6
|
merge 14.2.1-3 into asm-14.2.2
Former-commit-id: f10f6d4e8a [formerly 2294c81a57 [formerly a116be206fc8a24dd12610db37db6f26c65a19b0]]
Former-commit-id: 2294c81a57
Former-commit-id: 4a62e83835
|
2014-01-27 15:27:49 -05:00 |
|
Max Schenkelberg
|
84377d3e8c
|
Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747
Former-commit-id: 63e90f6955 [formerly 17b38d9f72 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]
Former-commit-id: 17b38d9f72
Former-commit-id: 487775918d
|
2013-09-11 16:32:00 -05:00 |
|
Lee Venable
|
1b42530bd5
|
Issue #2256 - Memory leak fixes and some code clean up fixes.
Change-Id: I7b16871f59e63218b1d5754ac460bbab056f78a5
Former-commit-id: 49c06062fe [formerly 752371bc63 [formerly 67228c5208da07cc56b95ce378ec50370541a260]]
Former-commit-id: 752371bc63
Former-commit-id: 212c830986
|
2013-08-16 15:04:28 -05:00 |
|
Max Schenkelberg
|
db24201469
|
Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2
Former-commit-id: c5575f9624 [formerly 6f60751ec6 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]
Former-commit-id: 6f60751ec6
Former-commit-id: bbad83c21a
|
2013-08-15 12:21:43 -05:00 |
|
Max Schenkelberg
|
cb1d5d1c5b
|
Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f
Former-commit-id: d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]
Former-commit-id: 0f3c791120
Former-commit-id: b95a96f4c9
|
2013-08-09 14:24:49 -05:00 |
|
Steve Harris
|
79567aac51
|
13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 2f517b7713
Former-commit-id: f95e0ad10b
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
e8f4a2f031
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
268262da26
|
12.12.1-10 baseline
Former-commit-id: 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]
Former-commit-id: 45f5150eb6
Former-commit-id: c7ec50d4f9
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
8278cac143
|
12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
0d8d18d7e2
|
12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
7248f8b762
|
12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
32fdf6ed3b
|
12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
7fa9dbd5fb
|
12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
4767b0e069
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
760ead2047
|
12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
d8da2252c3
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
|
2012-01-19 11:53:12 -06:00 |
|
root
|
133dc97f67
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
|
2012-01-06 08:55:05 -06:00 |
|