xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7316 commits 31 branches 40 tags 3.8 GiB
Commit graph

67 commits

Author SHA1 Message Date
Slav Korolev
fee32a7db1 Omaha #3667 - Corrected functionality of dialog. 
Former-commit-id: 4c4bfa4caf [formerly 45c9b0560a] [formerly fbb9e62cfc] [formerly 4c4bfa4caf [formerly 45c9b0560a] [formerly fbb9e62cfc] [formerly 9f0b1a68e6 [formerly fbb9e62cfc [formerly cf354d6ac5668ba502feb188bdf17a0967168b19]]]]
Former-commit-id: 9f0b1a68e6
Former-commit-id: 86ce2c3b01 [formerly a49a3bbcc4] [formerly 30c397b4d689693d46f2fd6397cd152d2fc5c34b [formerly a3aaf1a744]]
Former-commit-id: 1991a0498f5dcd9f48094a5cf08d1796b85a0371 [formerly 0ba3e8d678]
Former-commit-id: 37a7beb45e
 2014-11-06 15:24:12 -05:00
Slav Korolev
2e67cc2d9f Omaha #3220 - Corrected area configuration managers for Fog, SAFESEAS and SNOW monitors. 
Former-commit-id: c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly c91e636d98 [formerly 1f4ed7fd1b] [formerly 9c369a9c5c] [formerly 8971f40dc2 [formerly 9c369a9c5c [formerly 5fb653e5c7f7ffff1daf53487147597a569d7d11]]]]
Former-commit-id: 8971f40dc2
Former-commit-id: 042bf2b482 [formerly 19db4c34bb] [formerly 726de9ad3e8e7237b0a845990c102ba09fdadeed [formerly e517a73d81]]
Former-commit-id: 15e97a6a51d909c6ddad439e6a80921dbeecac9b [formerly de09cba07a]
Former-commit-id: 8a6f3b4749
 2014-10-20 15:06:05 -04:00
Steve Harris
118c19a83d Merge tag 'OB_14.3.1-25m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c0c1ce7700 [formerly 39b2199cec] [formerly ad4393bea3] [formerly c9e37bf440 [formerly ad4393bea3 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]
Former-commit-id: c9e37bf440
Former-commit-id: e80527ade2 [formerly fc424d7336] [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52 [formerly fc35b7313d]]
Former-commit-id: 292297ad70be43ccc935b96eca7a8409d4033fc4 [formerly f370a2f54e]
Former-commit-id: 7c4bb336e1
 2014-10-07 13:35:58 -05:00
Slav Korolev
8ed04b61f1 Omaha #3220 - Changes in the area configuration files for FSSObs monitors. 
Former-commit-id: 87c7787cb2 [formerly 1120f9a440] [formerly 7b1a4c6774] [formerly 87c7787cb2 [formerly 1120f9a440] [formerly 7b1a4c6774] [formerly ce2ef5019b [formerly 7b1a4c6774 [formerly d7a921d6206f5b09e7a6784c7e86b9167b74685f]]]]
Former-commit-id: ce2ef5019b
Former-commit-id: 2272e5581a [formerly 7e739e4197] [formerly ff4736b57ad7b9270a66a08b26833bcbbe520650 [formerly 11ee774939]]
Former-commit-id: aca0ddcbd2e670daff2cd8182a38f2ae07972d37 [formerly 3033eba2f3]
Former-commit-id: 27f8c438d2
 2014-09-25 09:02:27 -04:00
Slav Korolev
de8fd3acb9 Issue #2757 - Fixed problem with adding and removing zones. 
Former-commit-id: d8f3f75c07 [formerly 4c209b4958] [formerly fa76420af3747729103225928cbcb7ee8ee3c133 [formerly 443c7c7482]] [formerly d8f3f75c07 [formerly 4c209b4958] [formerly fa76420af3747729103225928cbcb7ee8ee3c133 [formerly 443c7c7482]] [formerly a4914bd85d [formerly 443c7c7482 [formerly 31ccaf218df628327fe4b27d69a4500eb1dc8d84]]]]
Former-commit-id: a4914bd85d
Former-commit-id: 90b3e23aac [formerly 1596ad20b6] [formerly b3531890f44af7788db8826f064c5a69cb875795 [formerly d08b42a7de]]
Former-commit-id: 88c32de2eac43d023c6b67f9e8ee0834d7094648 [formerly 512ca34484]
Former-commit-id: a0a543439f
 2014-09-24 09:34:43 -04:00
Slav Korolev
7bb7350a8c Issue #2757 - Updated handlers for dialog buttons. 
Former-commit-id: ba5acfdda0 [formerly d2dd00d2ae] [formerly 17599a9fbeb3f91ce886f3fa7ad1d0c36abccfd0 [formerly 71c4d8db07]] [formerly ba5acfdda0 [formerly d2dd00d2ae] [formerly 17599a9fbeb3f91ce886f3fa7ad1d0c36abccfd0 [formerly 71c4d8db07]] [formerly 23ec338be0 [formerly 71c4d8db07 [formerly 69a82633c287bf18c9f436014bb552829dcb62ea]]]]
Former-commit-id: 23ec338be0
Former-commit-id: cad2fc287e [formerly 6b67a43b72] [formerly 5df7ec46207367810cbdd758111e799776aa334a [formerly 780dedce8a]]
Former-commit-id: e9a0630ba840449ff9ac04e5b73d1d8f7d1f9d0f [formerly d576d1d2fd]
Former-commit-id: 48cf5d015d
 2014-09-19 15:02:59 -04:00
Nate Jensen
f7ae70ac02 Omaha #3356 cleanup of unnecessary register buddies and buddy policies 
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0

Former-commit-id: d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly d61c65787b [formerly 253198b5bc] [formerly b3083a663e] [formerly 9b72a1399d [formerly b3083a663e [formerly 48536dd79d933508ac54b3b6e9bbd166fd218330]]]]
Former-commit-id: 9b72a1399d
Former-commit-id: e7b11aaf88 [formerly 58a4cb95c1] [formerly 1fed4e6852cd8eca79ebee598c5badd5a0a3fe14 [formerly d67083655a]]
Former-commit-id: 7e191ad12969bca5c4c6b83a1e9488c58f4c6928 [formerly 951feab33d]
Former-commit-id: 7336692b85
 2014-08-14 10:22:37 -05:00
Nate Jensen
cf101fa32d 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: f83883f478 [formerly 92b1fb11e5] [formerly 6e94ea9d2b] [formerly f83883f478 [formerly 92b1fb11e5] [formerly 6e94ea9d2b] [formerly f8d9235104 [formerly 6e94ea9d2b [formerly 4f691341c0368c3e015c73f25aab0cf8877802ac]]]]
Former-commit-id: f8d9235104
Former-commit-id: 6b7c0607bb [formerly 8e6d26df88] [formerly 758558f07df22f2211e130fe18c672ae61e217f5 [formerly 619f0ac245]]
Former-commit-id: 3a6313d5f51de9ac207b2ba1e2d49787937b4db6 [formerly 2889a0fedb]
Former-commit-id: 875a4ae026
 2014-08-04 18:03:15 -05:00
Slav Korolev
18134b5093 Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager. 
Former-commit-id: 78d009705b [formerly adba0cd20a] [formerly e3fe3c9736] [formerly 78d009705b [formerly adba0cd20a] [formerly e3fe3c9736] [formerly 81033087ea [formerly e3fe3c9736 [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]]
Former-commit-id: 81033087ea
Former-commit-id: 2d330b6849 [formerly 55b01dce6d] [formerly ffff3de7255ddc5811bb800ab442d18dc7fb0afc [formerly 4a8e7fc38e]]
Former-commit-id: 4e04ae2abf2ea5763d2bc71363ef09579b4737e9 [formerly ced313a7f1]
Former-commit-id: bcc5a458b3
 2014-05-27 12:24:50 -04:00
Nate Jensen
14c3cb008b Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt 
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851

Former-commit-id: 11db335c3a [formerly e464500dfc] [formerly 07426ce408] [formerly 11db335c3a [formerly e464500dfc] [formerly 07426ce408] [formerly 174fae77d1 [formerly 07426ce408 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]]
Former-commit-id: 174fae77d1
Former-commit-id: 5b8f3aada2 [formerly c31080d705] [formerly 59ddbe2030bf3ffb614a1ba31e37cfb021339cfb [formerly ea7b123eef]]
Former-commit-id: d3e19b5f43cade3b4e741900facacc51b5142159 [formerly 4a18f1e24b]
Former-commit-id: 824c2f805d
 2014-05-13 13:12:54 -05:00
Slav Korolev
d5438ccac5 Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs. 
Former-commit-id: f39c9c151d [formerly 150a132320] [formerly 689930c484] [formerly f39c9c151d [formerly 150a132320] [formerly 689930c484] [formerly f458f75ecf [formerly 689930c484 [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]]
Former-commit-id: f458f75ecf
Former-commit-id: 4dca796283 [formerly 27095ecca8] [formerly 72ea0b9194f024a8e7ff25eef75d71cd7b0f041d [formerly e78c6edb8c]]
Former-commit-id: 8dff33928d12bb7f6066533d4e9a0cc09195cf1f [formerly 1bf6d72572]
Former-commit-id: cd38f3636d
 2014-04-24 15:40:52 -04:00
Nate Jensen
f84adac681 Issue #2984 remove unnecessary dependencies on edex 
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

Former-commit-id: 2561050293 [formerly ef43b2d325] [formerly 2253938ed5] [formerly 2561050293 [formerly ef43b2d325] [formerly 2253938ed5] [formerly df4171b29d [formerly 2253938ed5 [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]]]
Former-commit-id: df4171b29d
Former-commit-id: d6a968cac2 [formerly 4011b1351f] [formerly 024b55876a4025da8b49a4ff3d68557b772e23a5 [formerly 24c8b0a327]]
Former-commit-id: 25c60d2192a236220a6b597edaac8c5cc4d3c07b [formerly 5795254827]
Former-commit-id: cc150c8a1a
 2014-04-21 11:32:41 -05:00
Everett Kladstrup
f815fbcb60 Issue #2725 Move derived parameters logic to common 
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly eab1358602 [formerly 8b19b3601a] [formerly 06d6961c0f] [formerly 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]]]
Former-commit-id: 0699041518
Former-commit-id: 29ce7781c9 [formerly 86bf2b5ea0] [formerly eb5b00071037510aefc04c8c20411cc18c44abb0 [formerly 260d0beddc]]
Former-commit-id: 41d01092799ccea952f65c9d6b66d93b56557541 [formerly d96b56c91a]
Former-commit-id: 7b2683532a
 2014-04-09 09:31:12 -05:00
Max Schenkelberg
7c66cf792b 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: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26 [formerly 39e1c4fa46] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134]
Former-commit-id: c6cf08db73
 2014-03-04 09:23:36 -06:00
Slav Korolev
1964f52bc0 Issue #2757. Added filter for removed stations and cleaned code. 
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534

Former-commit-id: 91972c1b42 [formerly cbd17ea025] [formerly c7c40a3467] [formerly 91972c1b42 [formerly cbd17ea025] [formerly c7c40a3467] [formerly fa59172d87 [formerly c7c40a3467 [formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]]]
Former-commit-id: fa59172d87
Former-commit-id: 0ebbffc8fc [formerly aea166d7b9] [formerly 9e17821f974894adbc9405dc7e9472062b30ba3c [formerly 4ec22d9530]]
Former-commit-id: 9d5d14a3e49ab60496fd1e6b5d14e240364fd62b [formerly 65ea06a366]
Former-commit-id: bd2141d123
 2014-02-04 15:21:22 -05:00
Slav Korolev
4cac912be3 Issue #2757. Fixed issues in Area Configuration Dialogs. 
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf

Former-commit-id: 7b3702c186 [formerly 6013121a99] [formerly ea573d2c30] [formerly 7b3702c186 [formerly 6013121a99] [formerly ea573d2c30] [formerly a768f540f0 [formerly ea573d2c30 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]]]
Former-commit-id: a768f540f0
Former-commit-id: f6ea436e80 [formerly d2d4672a46] [formerly a981a42007f76a4e25e017ce265ad6fb22a436d4 [formerly 6d9a066c36]]
Former-commit-id: 4f37da138bfd1a624cb5c2b39655d2127c907a2a [formerly baf598a6ff]
Former-commit-id: 559d0f9499
 2014-02-03 09:50:01 -05:00
Slav Korolev
ac5540213e Issue #2653. Corrected decoding of SNOW monitor data. 
Former-commit-id: 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 679b61deea [formerly eb5ec35275] [formerly 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91]]
Former-commit-id: 9c64be7095aadcd4adef7f3b53b64c6684b3b86d [formerly 4fd070dd46]
Former-commit-id: 4c3ce254b6
 2014-01-07 11:48:13 -05:00
Richard Peter
f362062048 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: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
 2013-12-05 12:12:27 -06:00
Steve Harris
31c94115c7 14.1.1-12 baseline 
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 1e4b2bac7b [formerly 4e6f319422] [formerly 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]]
Former-commit-id: e177b16a88af27dc0abf4496fe58fbe454cfa8c9 [formerly 234ca267ed]
Former-commit-id: 60f062ea59
 2013-12-04 16:47:59 -05:00
Richard Peter
d289419c40 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6 
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 6502f1f695 [formerly 2c753c427c] [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]]
Former-commit-id: 0074b774f0
Former-commit-id: 625647a717 [formerly b4aac09ff4] [formerly 9dbc5783e450aca6291faa5547b5b3369711eda7 [formerly 96b4944b41]]
Former-commit-id: 2067b058e879c394c330dccfc1994698c7f7cb05 [formerly e2a16fd876]
Former-commit-id: 705339a320
 2013-11-14 14:40:23 -06:00
Steve Harris
7facd4fe25 14.1.1-8 baseline 
Former-commit-id: 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly 8606fed724 [formerly 90bc008a50] [formerly aa6c977e7b] [formerly c7d36eb6ad [formerly aa6c977e7b [formerly 41e87fe87d5074f138649c5ca8053e658488fbd0]]]]
Former-commit-id: c7d36eb6ad
Former-commit-id: 1902ca9cfb [formerly b7ca6163e3] [formerly 308b50b78ab6c50e65c5dc077e1c7d14c94b3bd7 [formerly 0123596fd9]]
Former-commit-id: 299bb48cc93fac70de777c99a73fd516cc085238 [formerly 42ece4fb6a]
Former-commit-id: d2104614be
 2013-11-13 12:32:17 -05:00
Ben Steffensmeier
4dfe17eca2 Issue #2491 Clean a few more procedure only objects from ISerializableObject files. 
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: dd2bb59742 [formerly d38879158d] [formerly c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]]
Former-commit-id: 6bf4ce1b85d10c2151244620ecdee96d3fb2244e [formerly a0f4c08cfd]
Former-commit-id: dacf863d66
 2013-11-04 13:01:49 -06:00
Nate Jensen
360066e5b8 Issue #2361 remove dependencies on mesowest and delete dead grichardson code 
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]]
Former-commit-id: 2f79b34a77
Former-commit-id: d2af0d52a6 [formerly 2419a99ac7] [formerly a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]]
Former-commit-id: a2aea41bda81ba451fdb55f8030f7d56d6699493 [formerly c9cdcc056a]
Former-commit-id: 41dab56b49
 2013-10-23 14:52:29 -05:00
Lee Venable
cdba1e48df Issue #2443 - fixed image memory leak. 
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]]
Former-commit-id: 47f8200757
Former-commit-id: fc98572a27 [formerly 03c4e9a287] [formerly 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]]
Former-commit-id: ba282d5c92d098a16eba78a72542a536bd52ee6b [formerly 162df3c8d2]
Former-commit-id: e2b44eac03
 2013-10-08 09:39:00 -05:00
Lee Venable
c328869516 Issue #2436 - disposed of the sort color 
Former-commit-id: f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly f27781b74e [formerly 8c8adf8be6] [formerly 9c97908f36] [formerly c4ddd46b44 [formerly 9c97908f36 [formerly 4545de35a0fdbfc5817a8725bf07ae0c405efb39]]]]
Former-commit-id: c4ddd46b44
Former-commit-id: ccbc44f9d3 [formerly 2ed106cac4] [formerly b50a8d2a19218358b07a31a6ee2f605c0ead6152 [formerly 46db8998a6]]
Former-commit-id: d130264f10b1958114f77cf64c39663d19c8c154 [formerly 1000147d0c]
Former-commit-id: b0af7745a6
 2013-10-07 09:11:25 -05:00
Max Schenkelberg
b5300b8f15 Issue #2277 Remove more ScriptCreator references 
Change-Id: I8524faa9914c81afb7ace709b857bca2ef7ff747

Former-commit-id: 84377d3e8c [formerly 487775918d] [formerly 17b38d9f72] [formerly 84377d3e8c [formerly 487775918d] [formerly 17b38d9f72] [formerly 63e90f6955 [formerly 17b38d9f72 [formerly 0d898da3aebc056c372c7785538b0b27e3e986ef]]]]
Former-commit-id: 63e90f6955
Former-commit-id: bfb43525f4 [formerly 96852b88ec] [formerly 59063b336b6f01e333d1863cd1bfa081ea66cd8d [formerly e4b18ef410]]
Former-commit-id: bbd77f752997e583b5b69ab5e3012b80b3da1622 [formerly 87d33eb32f]
Former-commit-id: 00364668a4
 2013-09-11 16:32:00 -05:00
David Gillingham
2e5e666153 Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into 
Java. Convert to use of these new methods where possible. Create unit tests.

Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d

Former-commit-id: bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 218ec39696 [formerly 9c656c28b9] [formerly 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2]]
Former-commit-id: c1a7c1d2b9b5f35177db262289e7dc470702f3ad [formerly f46f62ff2e]
Former-commit-id: a217ce6044
 2013-08-15 11:30:45 -05:00
Nate Jensen
325654d640 Issue #2142 removing some viz dependencies on edex.common 
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 178107c128 [formerly bcdaae1922] [formerly 22438766b4] [formerly 4c9cc211ec [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 78e718122d [formerly a51d424851] [formerly 3dc4b88484b3a717a07e85e47dd00b4cd0dcaaee [formerly 797760bb71]]
Former-commit-id: c97be13fa7db2191a5a8ef2ef39d349d3dc46e1b [formerly c28a52bee8]
Former-commit-id: 3e7f3c66a8
 2013-07-22 12:20:43 -05:00
Max Schenkelberg
ad32bbd91d Issue #2142 Got log4j out of edex. 
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
 2013-07-15 14:26:15 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline 
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
 2013-03-25 13:27:13 -05:00
Steve Harris
2104c8b533 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc [formerly b423579e4a] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7]
Former-commit-id: d842ed88a7
 2013-03-05 12:27:49 -06:00
Steve Harris
f20c87110e 13.3.1-5 baseline 
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]]
Former-commit-id: e26f7eb151
Former-commit-id: aabd5cd51f [formerly a240379588] [formerly 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]]
Former-commit-id: 8b4bd6790f2136380dbac557b452d873c77bacc6 [formerly 1f98e01c57]
Former-commit-id: 79ff805090
 2013-03-05 10:47:06 -06:00
Steve Harris
34d0f59592 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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
 2013-02-21 15:41:39 -06:00
Steve Harris
fac2d20002 13.3.1-1 baseline 
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
 2013-02-20 16:19:40 -06:00
Roger Ferrel
1384a98c4c Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg. 
Change-Id: Ia57cfe88e22544260bbc03483b4c852843f67b42

Former-commit-id: 3275e6adfe [formerly 24c88a1673] [formerly 130fa3f73d] [formerly 3275e6adfe [formerly 24c88a1673] [formerly 130fa3f73d] [formerly 873f932f8e [formerly 130fa3f73d [formerly 64c6e3b9812dc7232bd36feff181805c4fd504d9]]]]
Former-commit-id: 873f932f8e
Former-commit-id: 26059ae7e0 [formerly 940d442f6f] [formerly 55ef04696c780948659739ded23b8f7dfe6ff66c [formerly f30b5846c1]]
Former-commit-id: 3ca8ee1793c0ddeed4459318c7900a91dedca32b [formerly 0f1f4fb42f]
Former-commit-id: 06db554bbe
 2013-02-07 12:46:01 -06:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline 
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
 2013-01-23 11:18:44 -05:00
Steve Harris
745f2c6409 13.1.2-2 baseline 
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
 2013-01-06 14:32:24 -06:00
Slav Korolev
f900e2b22f Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file. 
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 466abfbc1c [formerly 829899374d] [formerly 48f074eb72] [formerly 466abfbc1c [formerly 829899374d] [formerly 48f074eb72] [formerly 1a510a9f61 [formerly 48f074eb72 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]]]
Former-commit-id: 1a510a9f61
Former-commit-id: 46dfd61a44 [formerly a0d07a46f9] [formerly 20c7c17714ef04302d273f0fbac8ec2a7208298e [formerly 6bf265624d]]
Former-commit-id: 12c5585c0e0ccb7bda561900b86f3f8c4fae5f7b [formerly 0b82d18c64]
Former-commit-id: 2d3674e3c2
 2012-12-07 15:18:03 -05:00
Slav Korolev
a9fabaf914 Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments. 
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: 81d98a46f1 [formerly 349ea52e2b] [formerly a284f0f50f] [formerly 81d98a46f1 [formerly 349ea52e2b] [formerly a284f0f50f] [formerly b650fa6675 [formerly a284f0f50f [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]]]
Former-commit-id: b650fa6675
Former-commit-id: 59753c678d [formerly b5fc4b6800] [formerly ab9c4b8c7dbfa4854adca6dd7fb1a100ffd79506 [formerly 1c16ed59c1]]
Former-commit-id: 14e2d036ba5337bb7759432348ef01359a1f5aaf [formerly 61d69bbccf]
Former-commit-id: 02ea1250da
 2012-12-07 12:23:39 -05:00
Slav Korolev
47fcfda6da Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables. 
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly 32f192134d [formerly 153af1673a] [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 5e4bbc03a4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]]]
Former-commit-id: af101861e4
Former-commit-id: d9710603e7 [formerly fd46994bb9] [formerly d7de73f56f69ac57bd4c037b1331da78ad5eafa0 [formerly a6241ff4d8]]
Former-commit-id: ea094f0bb19456530bb0dfb6f5a0181129fb8e44 [formerly 7b66b5258d]
Former-commit-id: 627c3987ea
 2012-12-06 12:42:06 -05:00
Slav Korolev
fdcb811cad Issue #1297. Changed non-blocking ZoneTableDlg. Next patch. 
Changes from reviewers comments.

Change-Id: Ie812ef1167fa6b1ea78ee615190bd3059285a682

Former-commit-id: a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly a519f985ec [formerly 487a9eabb8] [formerly d220f74018] [formerly 4560efe149 [formerly d220f74018 [formerly 8f002a71cb688fe8fbf7378ef53398dfecb0354e]]]]
Former-commit-id: 4560efe149
Former-commit-id: 9bb8e24c52 [formerly 063c155818] [formerly 513793f8cfb0f26fa9576ec1dfb831fc65d80eec [formerly 765dbd8766]]
Former-commit-id: c377dec9d403627caffad2d4a3d988df6b86227a [formerly 711ba6b2b5]
Former-commit-id: 5c09c11912
 2012-11-16 11:08:42 -05:00
Dustin Johnson
eb82c7672b Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
 2012-11-08 09:57:16 -06:00
Steve Harris
94cd5a1388 12.12.1-1 baseline 
Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de]
Former-commit-id: af59663a99
 2012-11-07 12:41:20 -06:00
Slav Korolev
c405886581 Issue #1280. Changes for non-blocking TrendPlotDlg. Fixed format. 
Change-Id: I26af77a545c1ecd76dc6a15111e73d580992d77d

Former-commit-id: eefd20833a [formerly 2beb1dbc67] [formerly 52601577db] [formerly eefd20833a [formerly 2beb1dbc67] [formerly 52601577db] [formerly 8c1719f248 [formerly 52601577db [formerly d97fb49f2574dc320366475e02a5784be33bbaaf]]]]
Former-commit-id: 8c1719f248
Former-commit-id: a02d2ab1af [formerly 14c942cf5d] [formerly d0f3bb9f14ff41751a8ee2f8310b8ef7955fb539 [formerly 0e7baf252a]]
Former-commit-id: 53cddfca717322febcb7858ebc0200e38a72c502 [formerly f3dfa16b3a]
Former-commit-id: c66954b14b
 2012-10-24 09:24:02 -04:00
Steve Harris
98059f9ef1 12.9.1-5 baseline 
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
 2012-08-21 15:27:03 -05:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
 2012-08-15 22:15:20 +00:00
Steve Harris
31353e2296 12.9.1-1 baseline 
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
 2012-08-15 13:59:00 -05:00
Nate Jensen
06b3b8368d Issue #882 improved use of SimulatedTime 
Change-Id: I624427fe42f0d74bc62900216596e724857830fc

Former-commit-id: baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly baff86f951 [formerly 6f90bfa61c] [formerly a65e9608fd] [formerly 4a2841b287 [formerly a65e9608fd [formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]]]
Former-commit-id: 4a2841b287
Former-commit-id: 6d8ac0455e [formerly 7d478ac74c] [formerly 3ab4b622030a864dcf04c61605009347c3550e9a [formerly 8fa0eb70db]]
Former-commit-id: bc2d3c00a3e2d4d029b3e992acb5ae8618d96464 [formerly 04a7e5a8c0]
Former-commit-id: e1321b8bc9
 2012-07-31 08:57:54 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline 
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
 2012-07-10 07:53:49 -05:00
Bryan Kowal
e05b247e3b Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
 2012-06-27 17:21:48 -05:00