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

2078 commits

Author SHA1 Message Date
Mike Duff
3e20961fe0 Issue #2132 - review comments 
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 4399429e74 [formerly 4399429e74 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 82d713083a
 2013-07-02 16:08:37 -05:00
Max Schenkelberg
1e7b73c44e Issue #2122 Committing Geostationary projection for GOES-R fixed grid as well as cleanup to SatResource code. 
Amend: Fixed comment

Change-Id: I384a3fac3ad6e3ee8b4efd17246a26a1c4476c63

Former-commit-id: 9709b0500a [formerly 9709b0500a [formerly 9982c3ffdb399b8c3587d08e9427710ddbc61cb4]]
Former-commit-id: fef6056519
Former-commit-id: dc78010e74
 2013-07-02 15:22:31 -05:00
Mike Duff
c07d8ef10d Issue #2160 - Fix for MPE display 7x7 dialog, field changes 
Change-Id: Ib428d1aab246863bfdbbb271d27a4687197a3ebe

Former-commit-id: 655d9eb928 [formerly 655d9eb928 [formerly 1fbaa2721a4b2d79a06c1d4d8b8526b5b25150a9]]
Former-commit-id: 5b676b122d
Former-commit-id: d87b4bceb5
 2013-07-02 12:31:10 -05:00
Roger Ferrel
ea00a52ebe Issue #1964 clean up of features and manifest. 
Change-Id: Ie2fc8ce45853499d80863ab83ba6a60b76444548

Former-commit-id: 41c46e14c0 [formerly 41c46e14c0 [formerly 2590369cb4aa0c3d9c3885acb0ef27de36744e6d]]
Former-commit-id: 7d3362d2b5
Former-commit-id: 201e62a4ad
 2013-07-02 11:14:56 -05:00
Nate Jensen
d288dded44 Merge "Issue #2139 Loaded maps at cave start up." into omaha_13.5.1 
Former-commit-id: e4955f094c [formerly e4955f094c [formerly 5865b5ff9909ff00d047f41174b7e89ca921bb8b]]
Former-commit-id: 01efa33cb9
Former-commit-id: 150203f5cc
 2013-07-02 11:07:59 -05:00
Jonathan Sanchez
5431e5915d Issue #2139 Loaded maps at cave start up. 
Change-Id: If7d1e801190a2215c6043b81b4beb70e09ba9ee1

Former-commit-id: a2328f0e06 [formerly a2328f0e06 [formerly 55cb110ba6f328d9fb68d3a9c46254f342299237]]
Former-commit-id: de24b8b431
Former-commit-id: 4e1b0674e4
 2013-07-02 11:04:26 -05:00
Richard Peter
f916bba7ad Merge "Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog" into development 
Former-commit-id: 37042f0b2a [formerly 37042f0b2a [formerly 556e2ca39b7c93355cfa10ece835bdc63fd12d2c]]
Former-commit-id: a3bd7b3e9c
Former-commit-id: 8e15d6aa0a
 2013-07-02 10:30:51 -05:00
Roger Ferrel
68c22b7073 Issue #1964 Changed com.raytheon.uf.viz.archive include files needed in the binary build. 
Change-Id: Id5f135c25333d6906178f76782f2b370546863b9

Former-commit-id: c3ebc0cc1c [formerly c3ebc0cc1c [formerly 01585ddb95a65686eada207aacbe6f12a512c7f3]]
Former-commit-id: 68be9bd65f
Former-commit-id: 933009605a
 2013-07-01 15:45:14 -05:00
Nate Jensen
efcf0c8519 Issue #2142 initial cutover from log4j to SLF4J and logback 
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 316d6c09c6 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]
Former-commit-id: db6152e524
Former-commit-id: 6da64f329c
 2013-07-01 14:41:05 -05:00
Roger Ferrel
ac04c66be2 Issue #2088 Made FcstPointGroupDlg, FloodReportDlg, HydroBaseDlg and StationFilterOptionsDlg non-blocking. 
Change-Id: I44d41a5e3e4e00d924df190e253ae2568988d987

Former-commit-id: 1e7ae55676 [formerly 1e7ae55676 [formerly dd9ba84811ee60b4dae7fb940abf6ff2526869ba]]
Former-commit-id: 220818df3a
Former-commit-id: 3cabedbd45
 2013-07-01 13:03:39 -05:00
Mike Duff
0f4b98626b Issue #2130 - Fix ordering of columns in Subsciption Manager Dialog 
Change-Id: I97ce5323002d6c1ae230c446de9837e541e02c86

Former-commit-id: cd511c1a0c [formerly cd511c1a0c [formerly d2fbc8fca1efa7c1a467fe9970da74d47d0ba759]]
Former-commit-id: 5c7fd77f98
Former-commit-id: 053082cb80
 2013-07-01 11:53:07 -05:00
Nate Jensen
57d1375eed Merge "Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen."" into omaha_13.5.1 
Former-commit-id: f7e743f388 [formerly f7e743f388 [formerly 8b91364fc675cfa8eb0cb6faefb2951cca1e365d]]
Former-commit-id: 001fba449f
Former-commit-id: 0cb9726554
 2013-07-01 11:29:47 -05:00
Bryan Kowal
e6516def2a Issue #2153 - fix merge issue for build 
Former-commit-id: f052982f8e [formerly f052982f8e [formerly 25560718fb861f13ff8701b9458a6b18adf523be]]
Former-commit-id: 9c1aaa2bf5
Former-commit-id: 37a5eb6c69
 2013-07-01 10:52:29 -05:00
Jonathan Sanchez
a08032627c Issue #2139 Revert "Issue #2139 Run async job for loading maps in warngen." 
This reverts commit b046ea220c79e69eec32fa15fca28a84b3cf419c [formerly e4c0188c14] [formerly 81aad09d06 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]].


Former-commit-id: c883b4e636 [formerly c883b4e636 [formerly 765b5eea21f10ad1607aa99acb478eebf283e988]]
Former-commit-id: 7f74926bb4
Former-commit-id: 41e94abee3
 2013-07-01 10:40:48 -05:00
Richard Peter
3d6754337a Merge branch 'omaha_13.5.1' (13.5.1-4) into development 
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: 162261c395 [formerly 162261c395 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]
Former-commit-id: 76bc31aa77
Former-commit-id: d3017ca60f
 2013-07-01 00:04:43 -05:00
Richard Peter
7ceb1bb9ab Merge branch 'master_13.5.1' (13.5.1-4) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java
	edexOsgi/com.raytheon.uf.common.archive/build.properties
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/CategoryConfig.java
	edexOsgi/com.raytheon.uf.edex.archive/res/spring/archivepurger-spring.xml
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/purge/ArchivePurger.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archive/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	tests/unit/com/raytheon/uf/common/archive/ArchiveConfigManagerTest.java

Former-commit-id: 53258be797 [formerly 53258be797 [formerly e9ab10a54853ed6e7550cbbafea1d2d6231ce3f9]]
Former-commit-id: 582f38bdd4
Former-commit-id: 1757da59ee
 2013-06-30 23:46:32 -05:00
Steve Harris
c183e08922 13.5.1-4 baseline 
Former-commit-id: 70e4ff30a6 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: e197f23ce3
Former-commit-id: f658320357
 2013-06-28 09:46:25 -04:00
Brad Gonzales
f51c74e2d4 Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive. 
Amend: Added archive feature to the viz product build.
       Added archive feature to the viz developer product.

Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07

Former-commit-id: c28d1e5d4d [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]]
Former-commit-id: f4bb78381c
Former-commit-id: d842d8d9d0
 2013-06-27 17:40:07 -05:00
Dave Hladky
2a57eea47f Issue #2096 First steps to getting CAVE to display MADIS data 
Change-Id: I68925eef139c31e751bcb47f05f05cfd83b380b9

Former-commit-id: f5d3a5f012 [formerly f5d3a5f012 [formerly 1f33631d527ecbcecef31c255ac963556f5e1a4e]]
Former-commit-id: ee50b5c7be
Former-commit-id: 2b90920d8f
 2013-06-27 11:07:27 -05:00
Roger Ferrel
bec6928ea9 Issue #1966 Fix race conditiona and delay in populating GUIs combo/spinner entries also minor code clean up. 
Change-Id: I4df5a5e4b1fb1e868ce9e8914116c2ae67c029c3

Former-commit-id: ee409c0819 [formerly ee409c0819 [formerly 3572d3b28e641446040ae8a6bc96a8770aea6ba5]]
Former-commit-id: f66681f62b
Former-commit-id: 45dcfe3ad8
 2013-06-27 07:51:56 -05:00
Richard Peter
575405b14e Merge "Issue #1869 Fix plot sampling. Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b" into omaha_13.5.1 
Former-commit-id: 3a3dc3d208 [formerly 3a3dc3d208 [formerly 253e29abe56da5790c3a44ac7039426b068d6f12]]
Former-commit-id: 67d052307c
Former-commit-id: 208b01a167
 2013-06-26 13:25:39 -05:00
Ben Steffensmeier
0d2f556144 Issue #1869 Fix plot sampling. 
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 8c14a34f46 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]
Former-commit-id: 6db28c32a5
Former-commit-id: f26a72afe9
 2013-06-26 13:24:13 -05:00
Nate Jensen
b4c6a79741 Merge "Issue #2139 Run async job for loading maps in warngen." into omaha_13.5.1 
Former-commit-id: a60afe6640 [formerly a60afe6640 [formerly e1588427f01c1a6048d0dc423a6a706b3aa7529f]]
Former-commit-id: 10baafed63
Former-commit-id: 214fd8689c
 2013-06-26 11:14:03 -05:00
Jonathan Sanchez
c4ce4831c2 Issue #2139 Run async job for loading maps in warngen. 
Change-Id: I9df6c9f2a730a4c7fe4e64fabac00be96a673e7a

Former-commit-id: 81aad09d06 [formerly 81aad09d06 [formerly 084e506395a937030f7cee0cdb6f3322948d2b22]]
Former-commit-id: e4c0188c14
Former-commit-id: 47505aa013
 2013-06-25 15:29:08 -05:00
Roger Ferrel
b681d07346 Issue #1966 Initial Base configuration files for Dale Morris to test. 
Change-Id: I764b440aed1568e59cada95f0d6938c90bedc2f1

Former-commit-id: 2cfff5c563 [formerly 2cfff5c563 [formerly 34d765f948cf8cbebb0ab9745ef6803eecb8e968]]
Former-commit-id: c10f5c8d65
Former-commit-id: ee52f0281c
 2013-06-25 13:44:30 -05:00
Dustin Johnson
c2ed1495ad Issue #2106 Fix transactional semantics 
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits

Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9

Former-commit-id: fac7d3a9d9 [formerly fac7d3a9d9 [formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]
Former-commit-id: 69c09e530f
Former-commit-id: f67d02a394
 2013-06-25 08:33:55 -05:00
Richard Peter
8f49eea08f Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: d262c02612 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]
Former-commit-id: b007d4a302
Former-commit-id: af1099b3fb
 2013-06-24 18:51:56 -05:00
Richard Peter
4b582fef50 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 744eb64856 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]
Former-commit-id: 37645245e5
Former-commit-id: a7594f8c93
 2013-06-24 18:36:15 -05:00
Ron Anderson
740542cd56 Issue #2122 Fix the build 
Change-Id: I28e57ea57e1dc70beaf538586d27f2f83b5cdf2a

Former-commit-id: f75554f1f7 [formerly f75554f1f7 [formerly bf3b00be422d690aa9646462556607335ef85fc0]]
Former-commit-id: f06a8baf2d
Former-commit-id: 6740c9e40f
 2013-06-24 18:03:52 -05:00
Max Schenkelberg
20caab72f9 Issue #2122 Refactored satellite to use tile set renderable. Deleted old code 
Amend: Added fix for issue 2103
Amend: Added software history

Change-Id: I1e09bcbf28aaffbf602431a09af50da447e4cf2b

Former-commit-id: 47b55981c8 [formerly 47b55981c8 [formerly e98002c1d18eefe039f0bfc9f1b90ef577d42547]]
Former-commit-id: 2f03c38ca0
Former-commit-id: bc4ebb4f08
 2013-06-24 15:48:37 -05:00
Nate Jensen
3b22e752aa Merge "Issue #2122 Cleaned up dependencies for satellite" into development 
Former-commit-id: 6541a89bf5 [formerly 6541a89bf5 [formerly e2577f5b9c5bd3d518dbaeb8f3a38ef57f3a8966]]
Former-commit-id: 0479cea2e6
Former-commit-id: a2c5c2a1a3
 2013-06-24 09:12:12 -05:00
Steve Harris
1e939939b5 13.5.1-3 baseline 
Former-commit-id: 63803c1424 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 72d22a30c9
Former-commit-id: 810388f00a
 2013-06-24 09:29:43 -04:00
Mike Duff
a8a4393c82 Issue #2132 - Fix drawing lat/long box for madis point data 
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96

Former-commit-id: f685e73bd2 [formerly f685e73bd2 [formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]
Former-commit-id: 14bd577f6c
Former-commit-id: 65faaadc7c
 2013-06-21 14:59:03 -05:00
David Gillingham
3a78e38ae5 Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse 
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 6b696c9e6a [formerly 6b696c9e6a [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]
Former-commit-id: 4f6c293a7e
Former-commit-id: 8b7a998bbf
 2013-06-20 16:31:43 -05:00
Dustin Johnson
6987235067 Issue #2106 Fix setting of data size on gridded subscriptions 
Change-Id: I5dea937a9ad9f4691e58fb08a97ad6770cd8f925

Former-commit-id: b486e5f2fe [formerly b486e5f2fe [formerly c9138bb9d844ed7c38df420734c2723321ad450b]]
Former-commit-id: 554b43807e
Former-commit-id: eaa3e47877
 2013-06-20 16:00:08 -05:00
Lee Venable
ae73cbab32 Merge "Issue #2119 Added check when no selected lid." into omaha_13.5.1 
Former-commit-id: 377bc28f63 [formerly 377bc28f63 [formerly 2d05f18781938f3f52b70fcdcf7f1bcad60fe09e]]
Former-commit-id: 8b92b564d5
Former-commit-id: 9b564bef6a
 2013-06-20 09:22:36 -05:00
Nate Jensen
65157cd1de Merge "Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective." into omaha_13.5.1 
Former-commit-id: b7b2602271 [formerly b7b2602271 [formerly de43ca9364a34a3ace5ef41da75c5a295c805339]]
Former-commit-id: ba5c49fa61
Former-commit-id: 622e1298d2
 2013-06-19 17:45:41 -05:00
Max Schenkelberg
11f0bc708f Issue #2122 Cleaned up dependencies for satellite 
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e

Former-commit-id: 262d72b786 [formerly 262d72b786 [formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]
Former-commit-id: c57439e5ef
Former-commit-id: 959639d118
 2013-06-19 17:24:30 -05:00
Ben Steffensmeier
fa9d23798e Issue #2116 Do not deactivate contexts for parts when closing an inactive perspective. 
Former-commit-id: 0e6f3ff5e6 [formerly 0e6f3ff5e6 [formerly 7a73d0897230c0a33d4be153e9ebbf9477b3e829]]
Former-commit-id: 6de9e86090
Former-commit-id: accd308f8b
 2013-06-19 16:35:41 -05:00
Roger Ferrel
c549efa0c1 Issue #2119 Added check when no selected lid. 
Change-Id: Ia85dbc8957353ba44e94f7aa7b28cab0787165ac

Former-commit-id: dc5059f06b [formerly dc5059f06b [formerly 4a64a5b44a05a1c91b9a3d878ea0806e68c6d788]]
Former-commit-id: e7dc1184b1
Former-commit-id: 440ea0fc25
 2013-06-19 16:25:01 -05:00
Roger Ferrel
301fdd43ae Issue #1966 Check for modifications on close. 
Change-Id: I88b17fb6406fd41ede46085a7a6b40149a387e83

Former-commit-id: 784a56f2ce [formerly 784a56f2ce [formerly f6e51deb6cf7f50be7638b4670131cf39976944c]]
Former-commit-id: 67362de877
Former-commit-id: 259a66ac85
 2013-06-19 11:09:44 -05:00
Steve Harris
5343517c55 Merge branch 'omaha_13.5.1' into development 
Former-commit-id: 1e5ef65d03 [formerly 1e5ef65d03 [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]
Former-commit-id: cb95c711fd
Former-commit-id: 33bbec83ea
 2013-06-18 09:04:11 -05:00
Roger Ferrel
2b36404b6c Issue #1966 Column sort added; bug fixes to size estimates and saving files. 
Change-Id: Idbce325b98281732312205d093ca09bd5313bcaa

Former-commit-id: f175b19a93 [formerly f175b19a93 [formerly 195ba96c259535f00df44767c5dbc8777ece0e4c]]
Former-commit-id: c7c27c4cbb
Former-commit-id: cc39af5044
 2013-06-18 08:56:54 -05:00
Richard Peter
95bf734600 Issue #1977: Fix merge, remove duplicate method alterProductParameters 
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2

Former-commit-id: 9b8ef83ccb [formerly 9b8ef83ccb [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 1d706b3b72
 2013-06-17 19:01:20 -05:00
Steve Harris
316d2ec667 Merge branch 'omaha_13.5.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: 43316cbff9 [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]
Former-commit-id: 532d41787b
Former-commit-id: cb3e34813f
 2013-06-17 15:29:01 -05:00
Steve Harris
9c75ca8493 Merge branch 'master_13.5.1' into omaha_13.5.1 
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: 97631f9c62 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]
Former-commit-id: 40359c27c3
Former-commit-id: 41fb06e6ea
 2013-06-17 15:25:32 -05:00
Steve Harris
332a74c4de 13.5.1-2 baseline 
Former-commit-id: adb779323d [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: 3386330894
Former-commit-id: 3926dc20f7
 2013-06-17 15:01:22 -04:00
Mike Duff
069d2134e2 Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp 
Former-commit-id: 2fa207f744 [formerly 2fa207f744 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]
Former-commit-id: e51778ae88
Former-commit-id: 5c58b973ab
 2013-06-17 13:15:34 -05:00
Lee Venable
542de44fbd Merge "Issue #2079 add dispose method to ModeListener" into development 
Former-commit-id: 956a26aedc [formerly 956a26aedc [formerly f3619f573f102fcffd0503e0c0359e941568550f]]
Former-commit-id: af0a542f2f
Former-commit-id: 257de35a28
 2013-06-17 11:19:34 -05:00
Ben Steffensmeier
02f80f3de5 Issue #2107 Enable sampling by default for several display types. 
Former-commit-id: 2f21ec16f4 [formerly 2f21ec16f4 [formerly d8ede3a25fc352d12631a33b0a43f5e9ddf8fd27]]
Former-commit-id: b9d7e52fb8
Former-commit-id: b4e6c647a3
 2013-06-17 10:35:28 -05:00