Steve Harris
900b9aadde
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b8f0635ad67fcf9f1cb2
2013-03-18 16:52:00 -05:00
Dave Hladky
db207a732c
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
...
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: 9b495681ecc57d5574ef
2013-03-14 15:59:39 -05:00
Dave Hladky
160e1594b8
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 38b952a2205dc454c7ef
2013-03-13 13:56:33 -05:00
Dustin Johnson
48a96911c8
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 71365cd9451930183036
2013-03-13 08:39:08 -05:00
Steve Harris
d5bcdb0015
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 753a5213ab0cd7e56e65
2013-03-12 16:04:23 -05:00
Dave Hladky
6ea95002de
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: a1006667e04b08491880
2013-03-12 15:48:34 -05:00
Steve Harris
4ed21b702b
13.3.1-6 baseline
...
Former-commit-id: 3a4c7931e1566b677d09
2013-03-12 08:35:45 -05:00
Dave Hladky
73c21a6ead
Issue #1769 Crashing FFMP caused by thread wait
...
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: 2a854d7c30bb4c54eff0
2013-03-08 09:58:17 -06:00
Steve Harris
b9563da8a8
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: d5b80f9225aa0e9acefd
2013-03-05 12:29:44 -06:00
Dave Hladky
1260b40307
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 680317d9c4fc36146f48
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
5068b18c6a
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: f46686a6e22ca86633d6
2013-02-28 17:00:56 -06:00
Steve Harris
0051276ad1
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f6ec9e73035
2013-02-25 15:58:48 -06:00
Mike Duff
b1a549a99f
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 8bddd467b181649d346a
2013-02-25 09:29:16 -06:00
Steve Harris
33dd2589f1
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: a0573644c42641d578e2
2013-02-21 15:41:39 -06:00
Steve Harris
46d28be4a4
13.3.1-1 baseline
...
Former-commit-id: 71e8990021d2a654625f
2013-02-20 16:19:40 -06:00
Dave Hladky
b1c8f153e0
Issue #1635 Second Guidance source verification, general cleanup
...
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: 7b36b055f141f2ea7efe
2013-02-20 16:13:08 -06:00
Nate Jensen
a7b74e1f79
Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
...
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb
Former-commit-id: c2d4f8e164e6e2d8905c
2013-02-20 13:48:26 -06:00
Mike Duff
079ec4b6dd
Issue #1584 - FFMP performance stats and performance logger
...
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 0b044dba9c9c1e0ab639
2013-02-18 08:16:57 -06:00
Dave Hladky
4cd9b2e8b2
Issue #1627 Sped up FFMp load by removing un-needed DB calls.
...
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956
Former-commit-id: 8247da158fa8f6635a6f
2013-02-14 15:12:29 -06:00
Dave Hladky
5c66cbcd27
Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
...
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950
Former-commit-id: 7b3a310f67381aec5976
2013-02-14 13:58:32 -06:00
Mike Duff
15f96b75a5
Issue #1580 - Implementation of Stats/Event framework.
...
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd
Former-commit-id: def0464898b9f317bbd0
2013-02-08 10:23:45 -06:00
Steve Harris
30d38334cc
13.2.1-6 baseline
...
Former-commit-id: d0752de66ca46e33f06e
2013-02-07 16:00:39 -06:00
Dave Hladky
f6bd4ea0fa
Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
...
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf
Former-commit-id: c0712160d77af5aab08a
2013-02-05 12:23:56 -06:00
Steve Harris
47cc08ac79
13.2.1-2 baseline
...
Former-commit-id: 83e9157df7328c6dccad
2013-01-23 11:18:44 -05:00
Dave Hladky
81c9f8e21e
Issue #1475 QPF standalonoe displays appear slow
...
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a
Former-commit-id: 0f7a64798d6822591e1a
2013-01-15 15:50:27 -06:00
Lee Venable
fa143bd2e1
Merge "Issue #1353 old test code classes." into development
...
Former-commit-id: 0d74bf9e674e13d01e67
2012-12-07 13:22:46 -06:00
Roger Ferrel
125d271d40
Issue #1353 old test code classes.
...
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350
Former-commit-id: cfb11d2d38327f35c657
2012-12-07 11:27:31 -06:00
Roger Ferrel
b6ae15b04e
Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs.
...
Change-Id: Ie8589daa43e45a83835d119bdecc1674c7104ed0
Former-commit-id: 0c83b2a2773cb0385a93
2012-12-07 10:46:14 -06:00
Roger Ferrel
2a4a7a605f
Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg.
...
Change-Id: Ie5ed937d78478c91eab84998024ee3347f79c95e
Former-commit-id: 7233f6fd64c30152a13d
2012-12-06 13:40:48 -06:00
Roger Ferrel
7a146ba846
Issue #1353 Changes for non-blocking AttributesDlg.
...
Change-Id: I10c64bc287d7b5f79836ce14567df9cb05e4aa5d
Former-commit-id: bdaf7fa39e6efe221abf
2012-12-06 09:54:13 -06:00
Lee Venable
7943e69cf8
Merge "Issue #1353 Delete old test classes that no longer work or are referenced anywhere." into development
...
Former-commit-id: 67243cacf83fb520b16b
2012-12-05 16:19:05 -06:00
Roger Ferrel
104e7e54ee
Issue #1353 Delete old test classes that no longer work or are referenced anywhere.
...
Change-Id: Idcd6f01985b73f6a29af1e69699798d23ffc2d22
Former-commit-id: eef69ff910e985aca148
2012-12-05 16:06:19 -06:00
Roger Ferrel
2f3b693576
Issue #1353 Changes for non-blocking FFTIControlDlg.
...
Change-Id: Idf182e728a60d55aeb671201396c97beb3752bb3
Former-commit-id: b81d12f775171dd5c3bf
2012-12-05 15:45:43 -06:00
Roger Ferrel
3bdff81196
Issue #1353 Changes for non-blocking RetrieveMergeDlg and LoadSaveDelteSelectDlg close callbacks added to FFFGDlg.
...
Change-Id: I6ae982cef57ed66093145c93f4bec0491402882c
Former-commit-id: 6eb1c3cac345a957ebf3
2012-12-03 10:24:18 -06:00
Roger Ferrel
391f07ea69
Issue #1353 Changes for non-blocking FFFGDlg, AboutDlg, AcknowledgmentsDlg and HelpDlg dialogs.
...
Change-Id: Id72c6a0c0329f485fe7a9ca115c3f029019145e6
Former-commit-id: 64a78503b2f3b83e02b4
2012-11-29 13:21:15 -06:00
Steve Harris
cbbdb231ce
12.11.1-4 baseline
...
Former-commit-id: d3497e47eb6958b861f0
2012-10-16 13:27:07 -05:00
Steve Harris
deed84c1a2
12.10.1-5 baseline
...
Former-commit-id: a96d35a1fa4fd8893e55
2012-09-17 15:42:31 -05:00
Nate Jensen
00abcef8a0
Issue #1048 re-commit code cleanup changes from other branch
...
Change-Id: I2789e2c268f802c004f1594d7d2e5636065b5740
Former-commit-id: bdfb01c5018f7dbdb619
2012-09-17 15:29:52 -05:00
Dave Hladky
655939bba7
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 28912552fe6818408d40
2012-09-11 08:56:51 -05:00
Steve Harris
a14374fcd4
12.9.1-11 baseline
...
Former-commit-id: 6eb6b0909bfc405efab7
2012-08-30 14:36:12 -05:00
Steve Harris
dc08c5a71a
12.9.1-10 baseline
...
Former-commit-id: 3adc50a783cb9b80f3a0
2012-08-30 14:28:27 -05:00
Steve Harris
72824561cb
12.9.1-5 baseline
...
Former-commit-id: 61f269f54cf2fac39428
2012-08-21 15:27:03 -05:00
Steve Harris
9990bf909b
12.9.1-4 baseline
...
Former-commit-id: dcda3a229033b95fb96d
2012-08-15 15:19:10 -05:00
Steve Harris
e0c3722fd1
12.8.1-5 baseline
...
Former-commit-id: fd2abfb6f1cd49ef3eda
2012-08-01 10:45:37 -05:00
Steve Harris
4f7bb90bb0
12.6.1-9 baseline
...
Former-commit-id: 2c0ff851ca27afa60345
2012-07-10 07:53:49 -05:00
Steve Harris
676ea3192f
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e003904c4ccf5
2012-06-08 13:39:48 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Matt Nash
1faae42484
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40c83e5ff474
2012-01-19 11:53:12 -06:00
