Max Schenkelberg
1f8c88490a
Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
...
Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die
Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6
Former-commit-id: a113ecd2ea56ae27e172b648c5828eed77d56a84b648c5828eed77d56a84b24440cc37f681c1304c
2012-11-29 10:29:36 -06:00
Mike Duff
f4d7bbb7e0
Issue #728 - Implementation of Statistics graphs
...
peer review comments
Changing to use average value rather than sum.
Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f
Former-commit-id: 99b713bf3c4e15f63b4ec49759d28ef000c1a9cfc49759d28ef000c1a9cf56cd5da64d830a3918d9
2012-11-26 17:31:29 -06:00
Dustin Johnson
3ad9e1cbc2
Issue #1322 Add IDisplay
...
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92
Former-commit-id: bf8a8c3149973ffa6f714425d25c71d68c1f84f24425d25c71d68c1f84f2fe187f62f7bd77ea1c11
2012-11-20 15:22:52 -06:00
Roger Ferrel
af8fa780d2
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 2209d4d650e3ae2eb35522f8bc10f04c3af2a25822f8bc10f04c3af2a2588e85e1c8dfc1c0e53b2d
2012-11-13 12:55:33 -06:00
Dustin Johnson
cd5faf58bf
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: acd4cf94d8efd3d3735a064ef82d1e1dbeb22893064ef82d1e1dbeb228934222b24d092d1e886cf3
2012-11-08 09:57:16 -06:00
Dustin Johnson
fe8a2a3b09
Issue #1302 Merge branch '5-Data_Delivery' into development
...
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 7d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10bcf575966be7a0f96a9a
2012-11-01 13:36:06 -05:00
Roger Ferrel
bb352719b2
Issue #1229 Changes for non-blocking CaveSWTWizardDlg.
...
Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d
Former-commit-id: 0f0ca810d19a5a87635aae3fb5eef5314af882c6ae3fb5eef5314af882c639b1fcbb01d7fe430a7e
2012-10-22 14:07:18 -05:00
Roger Ferrel
6c659b159c
Issue #1229 Changes for non-blocking ViewMessagesDialog.
...
Change-Id: Id1bd1e36a2d16feec60c82997891577c98296fe7
Former-commit-id: 03e8d62864602c6d8d2e763c6ea58ce157187c72763c6ea58ce157187c727c63cb34951e6a58354c
2012-10-22 10:25:05 -05:00
Roger Ferrel
fe2f118cfa
Issue #1229 Changes for non-blocking SWTMessageBox.
...
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9
Former-commit-id: 41589589f1e17d8d4c37610444ee8838ae2b122e610444ee8838ae2b122edb1a29205a2ddf95c587
2012-10-18 14:06:02 -05:00
Roger Ferrel
59b171d6dc
Issue #1229 Changes for non-blocking SetTimeDialog.
...
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3
Former-commit-id: 55954ce256abd0476b6a40fb3f97294cd2f1c85140fb3f97294cd2f1c8517a095d2d99d51dc93248
2012-10-18 07:36:31 -05:00
Roger Ferrel
2244937369
Issue #1229 Changes for non-blocking LabelOffsetDialog.
...
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e
Former-commit-id: b8b908e88a3af99829a666379c3210d319101ed966379c3210d319101ed9928e9f6a1d4d39ffd53d
2012-10-17 15:12:55 -05:00
Roger Ferrel
f470c8fb1d
Issue #1229 Changes for non-blocking ImagingDialog.
...
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468
Former-commit-id: 4c906e7d5f3d15bf8be1c73acb0c30460acb4337c73acb0c30460acb4337b42cae4034a9cb110036
2012-10-17 13:53:29 -05:00
Roger Ferrel
85fbb59441
Issues #1229 Changes for non-blocking ColormapDialog.
...
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d
Former-commit-id: bacff2f0f1cdf5c546ab8e86f327146833c7e04c8e86f327146833c7e04cd5acf40cc21075e8ba16
2012-10-17 10:20:18 -05:00
Roger Ferrel
98f56ba457
Issue #1229 Changes for non-blocking SaveColorMapDialog.
...
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc
Former-commit-id: 1c4e87e968086223e7645e79024db37f3ab5434c5e79024db37f3ab5434cf77e146c65e4016f2f59
2012-10-17 08:15:21 -05:00
Roger Ferrel
47fa3c0255
Issue #1229 Changes for non-blocking BackgroundColorDialog.
...
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9
Former-commit-id: 947b8762e8ac3014333559a2dd6a3ad60b4ca39659a2dd6a3ad60b4ca396757affcc66f253f2191b
2012-10-16 17:00:11 -05:00
James Korman
54c43b7e91
Issue #1229 - Issue #1229 - Change to use non-blocking.
...
Change-Id: I2da0ebd176f7f50d63d70aed28bfe3385ac39a48
Former-commit-id: 97c98fc2c80bffd25bdc7769d4cc14860bd4af047769d4cc14860bd4af043be1610080502510ff48
2012-10-11 11:31:43 -05:00
Ron Anderson
e8fc88fe89
Issue #1242 Fix wierd GFE behavior when Grid Manager is maximized.
...
Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8
Former-commit-id: cf62687a6a8136beddc7b041ccf0998e8c713884b041ccf0998e8c71388460171b46a2436284848c
2012-10-04 12:15:01 -05:00
Max Schenkelberg
8886c0b8fd
Issue #1222 Fixed MapResourceGroup to manage keeping capabilties in sync with underlying resources by using listeners. Also fixed issue where you can set map resources to be time match basis to avoid errors. Fixed build when merging in 12.10
...
Change-Id: Iec0389be3a563df2d14f079cdd127a32ba552237
Former-commit-id: 6ddec55b3ceb9cd3003a8cd4f17cd4d63f741ab58cd4f17cd4d63f741ab5b35aefa9e0962ea1d376
2012-09-28 11:43:03 -05:00
Roger Ferrel
b2ee32e743
Issue #1196 Added isDisposed to CaveJFACEDialog.
...
Change-Id: I6ad1c3e1ba9015d87d04603a30ac8d02bb36abe5
Former-commit-id: adc37587edfa0913508cd1e52778dbbfd519cefed1e52778dbbfd519cefe59b174d6bd54a1ad88b1
2012-09-27 16:31:11 -05:00
Roger Ferrel
e16105d078
Issue #1196 Changes for Valid Period Dialog.
...
Changes from review.
Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee
Former-commit-id: 3621f8bc9db629d03f38031fabe87ab3cd481696031fabe87ab3cd4816961ef155a4f0ac45c8984f
2012-09-27 10:40:47 -05:00
Roger Ferrel
c2b693b674
Issue #1196 Changes for WmoIdSelectiondialog and modification to CaveJFACEDialog's setBlockOnOpen.
...
Change-Id: I3b9cc2bdc32a8f82a2d9ca6927c7fcda02254e9a
Former-commit-id: 9d3d2d5b996fa8e821746cd9792f46471bab81726cd9792f46471bab81723bf89d2240d28e0d8560
2012-09-20 12:14:42 -05:00
Lee Venable
236e15e6bc
Issue #1165 : initial update for the dialog refactor.
...
Issue #1165 - added JFACE code update.
Issue #1165 - changed method names.
Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110
Former-commit-id: 5788991c346ac7e90550045297e67714eb99add7045297e67714eb99add7926711341168d0ee976a
2012-09-14 08:39:38 -05:00
Steve Harris
fd6e8d5b63
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da51eb89eb2a91e39617cba71dac6cad91e39617cba71dac6cad87a602dfeedbcb28ce77
2012-08-27 09:53:55 -05:00
David Gillingham
b33e97efd3
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: a03dfbea98f3a33e3df4f7182ae9c7ec2d211800f7182ae9c7ec2d211800cbd3bfacfa3b41cd02f4
2012-08-23 11:21:23 -05:00
Max Schenkelberg
56496dc03e
Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
...
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014
Former-commit-id: 79d98841a0fc06265360b69d2cad1c1b406ecfcab69d2cad1c1b406ecfcaaa9df46a1d47cefd1513
2012-08-20 14:47:14 -05:00
root
791f3f5b85
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd0987fc6b3dcb46f578795a453ee984cb46f578795a453ee9848a66b2f209537dbadf64
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
a50be67e0e
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: e65418717fe8524301b56d9d0a406f4203807a776d9d0a406f4203807a778a170234b8d7597d8cf7
2012-08-15 16:36:05 -05:00
Ben Steffensmeier
47059f915b
Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
...
Former-commit-id: 2c64112a4c474fe44037a4c46c7f550857d971b5a4c46c7f550857d971b5a02bb2c09208021bcfc2
2012-08-14 10:25:38 -05:00
Nate Jensen
cdccfa21de
Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
...
Former-commit-id: 39d65bbdbdda1e9ae3c3c0dad4432c1b3d6560e4c0dad4432c1b3d6560e4565100d787ca0c314851
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
7943034530
Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
...
Former-commit-id: e565237b6345a1cc1997ea0c7046af8984b35ff8ea0c7046af8984b35ff81c68f4e01e32d4848ef2
2012-07-12 13:35:52 -05:00
Roger Ferrel
9116d93f52
Issue #875 - Create com.raytheon.uf.viz.points
...
Amend: fixing code per review comments
Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627
Former-commit-id: cc1aecde2fbfcefac9090cf7d64cf49071334fe90cf7d64cf49071334fe9b3df932794c317c5d0a3
2012-07-12 11:32:03 -05:00
Max Schenkelberg
58abd127b7
Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
...
Amend: Fixed Richard's comments
Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3
Former-commit-id: 3bff06cf927d13c7d3399bbb68a54798c2ec7dc59bbb68a54798c2ec7dc57286b4e962c6d324aaeb
2012-07-06 16:01:47 -05:00
Max Schenkelberg
e0ab853ca7
Issue #821 Fixed editor menu so plugin.xml action contribution items
...
are created every time the menu is shown to make sure any submenus are
recreated in the action.
Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382
Former-commit-id: 4b91c8e16953fd2ec04784ae717563668838364d84ae717563668838364de3524fd4dff1eb4b4713
2012-06-28 11:53:21 -05:00
Bryan Kowal
dfd75b4c72
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: 455d7b90a9b1b294c401a33740e915b87b66abc5a33740e915b87b66abc59a7d0492feb4917e6708
2012-06-27 17:21:48 -05:00
Max Schenkelberg
3caff8171f
Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
...
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5
Former-commit-id: c1b95ef2c9a691f425ead0b06374e9130692aefdd0b06374e9130692aefd859e041e10e8e159bed0
2012-06-21 16:07:20 -05:00
Steve Harris
944e3148d4
Revert "12.6.1-10 baseline"
...
This reverts commit 530dfc0563f8497470fcb33c5bdfcfa2c0893d1a16fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee0584f7eddf862cf6a9f92b4b1f6975f25198a5cd6b4b1f6975f25198a5cd68367fb50f5333fd9c64e
2012-06-21 08:51:08 -05:00
Steve Harris
530dfc0563
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d06f1c7b73cddde63eee0a2c0893d1addde63eee0a2c0893d1ab33c5bdfcff8497470fc
2012-06-21 08:38:48 -05:00
Max Schenkelberg
ea948bbb82
Issue #697 added support for multiple editors
...
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c451c2a41e68dd99479eebfceef3c5a1dd99479eebfceef3c5a1e5e1a4de6af0d2893e97
2012-06-13 17:52:11 -05:00
Matt Nash
455ac1faf9
Issue #659 fix floating view issue when minimize happened
...
Former-commit-id: 7dc3044f263689ed489e96bf8b356ab65a0f124e96bf8b356ab65a0f124e3bd1a43af29e81392638
2012-06-13 10:04:12 -05:00
Steve Harris
6c0d8be39e
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3af6c0529ad2f20a86a3048860df6902f20a86a3048860df69027b50c57bdd7a4853091
2012-06-12 14:37:12 -05:00
Steve Harris
d5c94ccef2
12.6.1-5 baseline
...
Former-commit-id: 1ad64ffa9809f73b0601c99afab05f8947efbc7fc99afab05f8947efbc7fa945ed8e6db69fa75919
2012-06-11 16:23:47 -05:00
Matt Nash
a45f167db2
Issue #659 make fixes to float/dock
...
Former-commit-id: 8acb6d3be25accda84c9cc5c172a771f54c2d09dcc5c172a771f54c2d09dae53309d60b55c763a34
2012-06-11 10:21:40 -05:00
Steve Harris
1f521a70b3
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf5676ea3192f97c4db937e
2012-06-08 13:39:48 -05:00
Matt Nash
75ed94c837
Issue #659 toolbar is in session view now
...
Former-commit-id: ca96492c0e373db8535900f55c1d80e43fee448300f55c1d80e43fee4483304970e9a9f2d8da6b3d
2012-06-05 13:25:36 -05:00
Matt Nash
0a225b2540
Issue #659 float button for cool detachable functionality
...
Former-commit-id: bfcfcba5722b1ce9e674855193aa77cab515cbfd855193aa77cab515cbfd633fd997e5945095e345
2012-05-30 16:13:21 -05:00
Steve Harris
bc695ee025
12.5.1-6 baseline
...
Former-commit-id: ba6d779949df80148db624474489f9fa87dc6cf124474489f9fa87dc6cf1c452cce6334792884ab2
2012-05-16 16:41:22 -05:00
Nate Jensen
a017a4cb07
Issue #590 fix issue when exiting GFE
...
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157
Former-commit-id: b6ab7baf517abedf890475754040cbc92f9ee70575754040cbc92f9ee705c55862a1ab4be7493c21
2012-05-11 13:58:46 -05:00
Max Schenkelberg
985ee5a034
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b06ee0bbf6f78e1bd2c621f5abc6e2078e1bd2c621f5abc6e203ca8ca6f012db836b296
2012-05-09 15:02:30 -05:00
Steve Harris
43f936900c
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: bcc12e03ed572e1bb47627bc36981858037cb5d127bc36981858037cb5d163ea8599d79c9e01dbda
2012-05-09 13:14:00 -05:00
Steve Harris
8025cc609e
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84ac708c050d84d191e7b6b36c69cc6784d191e7b6b36c69cc67a821111fbff6300cd995
2012-05-03 19:17:13 -05:00
