Ron Anderson
|
624375267e
|
Merge branch 'master_14.1.1' into solutions
Conflicts:
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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/IFPGridDatabase.java
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5
Former-commit-id: ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: 62c445d872
|
2014-01-13 17:45:20 -06:00 |
|
Steve Harris
|
43cc501e0d
|
14.1.1-14 baseline
Former-commit-id: f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: 9ef1c841b9
|
2014-01-06 14:02:30 -05:00 |
|
Richard Peter
|
62fa535744
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]
Former-commit-id: 2e7fd9ddba
|
2013-12-17 21:04:53 -06:00 |
|
Steve Harris
|
61d4adc979
|
14.1.1-13 baseline
Former-commit-id: c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]
Former-commit-id: b0b55a676b
|
2013-12-12 16:59:57 -05:00 |
|
Richard Peter
|
da027298d4
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]
Former-commit-id: a0b6ea8bb2
|
2013-12-05 12:12:27 -06:00 |
|
Lee Venable
|
3a3333e4ec
|
Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]
Former-commit-id: b7be687903
|
2013-12-05 08:30:28 -06:00 |
|
Lee Venable
|
d433717c8c
|
Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b
Former-commit-id: 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]
Former-commit-id: a385ec612c
|
2013-12-05 08:25:46 -06:00 |
|
Steve Harris
|
14421048af
|
14.1.1-12 baseline
Former-commit-id: b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]
Former-commit-id: a3ec45a99f
|
2013-12-04 16:47:59 -05:00 |
|
Steve Harris
|
48df058653
|
14.1.1-7 baseline
Former-commit-id: 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 4fff87723f
|
2013-11-06 14:16:14 -05:00 |
|
Ben Steffensmeier
|
4311d8ea4c
|
Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]
Former-commit-id: 3150d960e8
|
2013-10-25 15:42:53 -05:00 |
|
Nate Jensen
|
4cd95b545b
|
Issue #2361 fix scan alarm dialog
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426
Former-commit-id: 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]
Former-commit-id: 81fd87d9dd
|
2013-10-17 13:55:19 -05:00 |
|
Lee Venable
|
36176665ff
|
Issue #2474 - Fixed font memory leak.
Former-commit-id: a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]
Former-commit-id: f3a9e541a1
|
2013-10-14 12:42:27 -05:00 |
|
Lee Venable
|
107b35761b
|
Issue #2471 - fixed color memory leak.
Former-commit-id: bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]
Former-commit-id: 61e5d5e4da
|
2013-10-11 11:09:57 -05:00 |
|
Lee Venable
|
717ba7e08e
|
Issue #2447 - fixed color memory leak.
Former-commit-id: 527f88ddac [formerly fe59f0923caa13c089edb683611b986522476539]
Former-commit-id: 8d341f499d
|
2013-10-09 10:07:37 -05:00 |
|
Max Schenkelberg
|
e4b18ef410
|
Issue #2277 Remove more ScriptCreator references
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747
Former-commit-id: 17b38d9f72 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]
Former-commit-id: 63e90f6955
|
2013-09-11 16:32:00 -05:00 |
|
Richard Peter
|
ae956e3b4b
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]
Former-commit-id: 7175e78cf7
|
2013-09-03 11:51:27 -05:00 |
|
Ben Steffensmeier
|
41411ce1c1
|
Issue #2262 Clean out manifest files that don't need meteolib.
Change-Id: I6188a05fa34e573fca64e743a8ec8ab9f8ac280a
Former-commit-id: 6b7206a736 [formerly e418a3be203c15b24478239fd50a2b4b173f22eb]
Former-commit-id: 2133ca3032
|
2013-08-26 11:39:04 -05:00 |
|
Mike Duff
|
03b3b3860a
|
Issue #2143 - Fix various issues with SCAN/DMD/TVS
Change-Id: Ice9a0f13881c31ca1d51f2f2158f74caa064f1f8
Former-commit-id: c871d6a1cd [formerly 0d5a35fcaac31c594ae7e5abda889e75a772c352]
Former-commit-id: 640a154647
|
2013-08-15 14:14:07 -05:00 |
|
Max Schenkelberg
|
759ff7bcfd
|
Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]
Former-commit-id: 06dbae8bdb
|
2013-08-14 09:20:28 -05:00 |
|
Max Schenkelberg
|
17a28bf292
|
Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5
Former-commit-id: 49381ac481 [formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]
Former-commit-id: 3f35c335c9
|
2013-08-12 17:37:15 -05:00 |
|
Max Schenkelberg
|
75c95e83ef
|
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: 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]
Former-commit-id: d79cfe8ad1
|
2013-08-09 14:24:49 -05:00 |
|
Slav Korolev
|
5d180b2e58
|
Issue #2143. Changes for non-blocking SCAN dialogs.
Change-Id: I0afcaced20e0cc76cbcb2d64a24fcfc3022dc1d1
Former-commit-id: 0c0941ad5d [formerly 5539da3d19fa0c174eba1a8733e946ca10e5f4bb]
Former-commit-id: 4afde7addb
|
2013-08-02 09:53:56 -04:00 |
|
Mike Duff
|
075cd28b9c
|
Issue #2218 - improve error handling and performance in SCANMonitor
Change-Id: I0b65dcb372c69ad736b3a550392299507dbcedeb
Former-commit-id: e23aaedada [formerly cff253a5eb779a2f5e156d5802dc9bb8afc2e7e0]
Former-commit-id: 4034146e23
|
2013-07-25 08:35:30 -05:00 |
|
Max Schenkelberg
|
1610826d2e
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 50825200a1
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
f658320357
|
13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: e197f23ce3
|
2013-06-28 09:46:25 -04:00 |
|
Lee Venable
|
08b70b3bcb
|
Issue #2065 Added code to alert user to use the clear button to close SCAN dialogs
Change-Id: I9668a953f76a4dfa1ff4fb61ff6b15e21f77d755
Former-commit-id: 2099f63370 [formerly 399a031eeb9e3eeabf60533cae11df7062446797]
Former-commit-id: ef425c9807
|
2013-06-06 12:04:33 -05:00 |
|
Lee Venable
|
d6274ac813
|
Issue #1984 - Save images for table columns so they don't throw errors in Windows.
Change-Id: I42bb4549664296abde66d5904b0ce1739ba6232c
Former-commit-id: 187a4e9b17 [formerly 3f26818dfeb006393598af41faf33cac6957d3e0]
Former-commit-id: 377c675436
|
2013-06-04 15:48:40 -05:00 |
|
Steve Harris
|
b35027f661
|
13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 8347bed50e
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
7828293d32
|
13.4.1-4 baseline
Former-commit-id: d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: 7a78f8ac6e
|
2013-05-02 10:00:38 -05:00 |
|
Lee Venable
|
9a311fa8ff
|
Issue #1945 - SCAN performance improvements and code cleanup.
Former-commit-id: 41e2d9ee30 [formerly 834da4689a93e07fb668fc6b64a435722986d745]
Former-commit-id: b47c88a858
|
2013-04-29 14:38:00 -05:00 |
|
Nate Jensen
|
388dcb9e78
|
Issue #1926 consistently fast scan startup
Change-Id: If8d8cc4dd98a7c0b81bb2264a41d520895831b21
Former-commit-id: 26b58e9354 [formerly 10bd3ed35f766bdd61f130082a6917d6841f3351]
Former-commit-id: 3caf85558d
|
2013-04-26 15:41:52 -05:00 |
|
Nate Jensen
|
d059b1d524
|
Issue #1926 faster first time startup
Change-Id: Iddd1667d262204932b4f76b8e6c44e09cfc53ccc
Former-commit-id: 31b05de2d1 [formerly a184bc9a967754e2e12be73da7a1e16c02490432]
Former-commit-id: 51ebd8007a
|
2013-04-25 14:41:07 -05:00 |
|
Nate Jensen
|
2b5144aed9
|
Issue #1926 faster and cleaner cell track rendering
Change-Id: Idf5496946a6568640c465f5043ca098afe46c2c9
Former-commit-id: 64440f97ef [formerly 74b82955cf41099b5bc2fcc726ea515366722925]
Former-commit-id: 3294b4aea3
|
2013-04-24 10:01:20 -05:00 |
|
Nate Jensen
|
129feaee97
|
Issue #1926 somewhat free up UI thread on scan startup
Change-Id: I51e704efa3df6abb6ec84b68d8dfcb46bac61d7b
Former-commit-id: e917657497 [formerly dcb9b18777981409d109ecc314873914c8d27fbf]
Former-commit-id: e7ef0a3b87
|
2013-04-23 15:06:10 -05:00 |
|
Nate Jensen
|
e7af935f4c
|
Issue #1926 faster scan rendering and cleanup
Change-Id: I825690a953fa0967a4c9a3f74ab58bda779068ca
Former-commit-id: 4f78929858 [formerly 068d711ec098e55630eb087e4d6b1a16063ff0e7]
Former-commit-id: 1e419b79c2
|
2013-04-22 16:47:11 -05:00 |
|
Nate Jensen
|
74a5a462de
|
Issue #1926 speed up scan startup by not requesting PDOs since we have URIs
Change-Id: I7b223d9c94fb55931b1c650b115c545c7ca24180
Former-commit-id: 96cdc7ce76 [formerly 96e1427daa378280133f85a1ee24647a72c8e9af]
Former-commit-id: 91476c8e80
|
2013-04-18 18:29:15 -05:00 |
|
Nate Jensen
|
22f54ab95e
|
Issue #1916 fast rendering of CWAT Local Threat
Change-Id: Ia8129ac6a81f35b1ed4aca19edfb21022cee2344
Former-commit-id: 91fbdd4ad1 [formerly 66a036b90f75a844cbeed3eb1a483ccdc72ec11d]
Former-commit-id: 74edcf7706
|
2013-04-18 12:19:36 -05:00 |
|
Steve Harris
|
340a2cfb23
|
13.3.1-19 baseline
Former-commit-id: 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]
Former-commit-id: abaf9f12f9
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
4afa41d4e7
|
13.3.1-17 baseline
Former-commit-id: 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]
Former-commit-id: a3fe998f8f
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
bc439aee4f
|
13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: aaac0b51e5
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
47cc08ac79
|
13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
941337c553
|
13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: 4ba416aeb3
|
2013-01-06 14:32:24 -06:00 |
|
Steven Harris
|
8843ffd022
|
12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: feec28f274
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
72824561cb
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
0c5d9e2416
|
12.9.1-1 baseline
Former-commit-id: 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 79ce6cfd97
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
a4e519f3cd
|
12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
ce3b74c605
|
12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
65b22abd24
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]
Former-commit-id: b137302802
|
2012-02-17 10:55:02 -06:00 |
|
Matt Nash
|
1faae42484
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
|
2012-01-19 11:53:12 -06:00 |
|
root
|
3360eb6c5f
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
|
2012-01-06 08:55:05 -06:00 |
|