Commit graph

1595 commits

Author SHA1 Message Date
Dustin Johnson
b24ddaeb4e Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 1975cd0442 [formerly 6a90779214] [formerly 1975cd0442 [formerly 6a90779214] [formerly 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]
Former-commit-id: 2635e05723
Former-commit-id: 885f315d30 [formerly 492cee4992]
Former-commit-id: b1c159fc7f
2013-01-08 12:44:29 -06:00
Steve Harris
4f75e85c8f Merge "Issue #1459 fix interp function when data is shared amongst multiple parameters." into development
Former-commit-id: 41906e5278 [formerly d9650b113c] [formerly 41906e5278 [formerly d9650b113c] [formerly 4c5a92876f [formerly 217b8d82c7b558a8c78126c3ba37f915a8c9e693]]]
Former-commit-id: 4c5a92876f
Former-commit-id: 33b21a127c [formerly 64f6a70c37]
Former-commit-id: 02e2a634cf
2013-01-08 10:46:29 -06:00
Ron Anderson
deeb9ab71b Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: dc156f69c4 [formerly 61700b2f37] [formerly dc156f69c4 [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: 0a585a9498 [formerly 5e9f24b527]
Former-commit-id: 693548c7d2
2013-01-08 10:36:19 -06:00
Ben Steffensmeier
a8077ca1c3 Issue #1438 fix problems reading a non existent grid alias file.
Former-commit-id: 15c7614ffe [formerly 4ca0f320cc] [formerly 15c7614ffe [formerly 4ca0f320cc] [formerly ecbbc823f1 [formerly 77868132755b799810c9a01888fcec06798070fb]]]
Former-commit-id: ecbbc823f1
Former-commit-id: b9980a0f77 [formerly 777a1d93bb]
Former-commit-id: 1a1c6d7efa
2013-01-08 10:32:50 -06:00
Nate Jensen
b56796d0ac Merge "Issue #1329 fixed bug in FileLocker" into development
Former-commit-id: 42b24aa97f [formerly 27a96cf383] [formerly 42b24aa97f [formerly 27a96cf383] [formerly f77cf10fea [formerly 079e2ac290f6d914b103be4ebec0420c2f9f0a93]]]
Former-commit-id: f77cf10fea
Former-commit-id: efb750cc67 [formerly f160900fe5]
Former-commit-id: 4a020340ee
2013-01-08 10:30:21 -06:00
Bryan Kowal
2ec11e041a Issue #1460 - Merge 4.7-GIS_Viewer into AWIPS2_baseline
Former-commit-id: 87d0821429 [formerly 76fe910606] [formerly 87d0821429 [formerly 76fe910606] [formerly 03f108f80b [formerly 9e0eae1725af06ce834c926a4d70195a075e8152]]]
Former-commit-id: 03f108f80b
Former-commit-id: 7dd7d1cfa7 [formerly bbeb6b5101]
Former-commit-id: 74f4811f07
2013-01-07 18:14:07 -06:00
Richard Peter
4a3000f19a Merge "Issue #1456 Changed ArrayList parameter to List." into development
Former-commit-id: 2eae9d7131 [formerly 42252b2c5a] [formerly 2eae9d7131 [formerly 42252b2c5a] [formerly 39d6e335ff [formerly f813d20563b711e270f751d2659d414487af06fb]]]
Former-commit-id: 39d6e335ff
Former-commit-id: 5f02ab4bb6 [formerly c2044ef63e]
Former-commit-id: 09eae47452
2013-01-07 17:04:47 -06:00
Richard Peter
884d082f9e Issue #1454: Update registry log4j
Change-Id: If564a1a3d00c6b719603544e1a319928f3fedaa5

Former-commit-id: 08922e14b7 [formerly c8f79ee0cc] [formerly 08922e14b7 [formerly c8f79ee0cc] [formerly 7b4d04e828 [formerly 81dd356264723578ab871c63bc47386cfb3d40ce]]]
Former-commit-id: 7b4d04e828
Former-commit-id: 84c5aa1d29 [formerly b9ae764a04]
Former-commit-id: bf14d0167a
2013-01-07 17:03:15 -06:00
Brad Gonzales
64f14fab4f Issue #1456 Changed ArrayList parameter to List.
Change-Id: I47e7a054b774f5f2707f53b1c3692c3ec07ac157

Former-commit-id: 69fcfd55bb [formerly 1c6cfee5cc] [formerly 69fcfd55bb [formerly 1c6cfee5cc] [formerly 71230cc246 [formerly 6ba091caf7aa4de243fbea57ed19ae99ddb39585]]]
Former-commit-id: 71230cc246
Former-commit-id: d0fae4de6d [formerly 9bcf7cbd07]
Former-commit-id: 844ee8cd77
2013-01-07 16:55:04 -06:00
Ben Steffensmeier
6ee146e0ed Issue #1459 fix interp function when data is shared amongst multiple parameters.
Former-commit-id: 167fe74ee7 [formerly f04c6b7e1e] [formerly 167fe74ee7 [formerly f04c6b7e1e] [formerly c0e9f3429b [formerly 9c8281cd26029e9b3979fbc8f0ed713b66f092ba]]]
Former-commit-id: c0e9f3429b
Former-commit-id: 76802aefa9 [formerly 93e6818a2d]
Former-commit-id: 4a051b3a57
2013-01-07 16:39:45 -06:00
Brad Gonzales
9fcb9f9179 Issue #1456 Added DualList.setSelectedList(ArrayList<String>).
Change-Id: I86765b965f90bf714ede8707c516287a91c64de7

Former-commit-id: 945d6be2c8 [formerly cf3a7e1455] [formerly 945d6be2c8 [formerly cf3a7e1455] [formerly e457297ceb [formerly 334782a0f7df272200196a3905d656d2fa3603d7]]]
Former-commit-id: e457297ceb
Former-commit-id: 66a5a6d5bc [formerly 7b0dc0478d]
Former-commit-id: a0a9a3027e
2013-01-07 16:08:18 -06:00
Max Schenkelberg
85e82e4b78 Issue #1329 fixed bug in FileLocker
Change-Id: Ide1f4cb2d9f5d6f6ebfb2eed8bac583f0b0e153e

Former-commit-id: ebb303ee06 [formerly d779a82c5e] [formerly ebb303ee06 [formerly d779a82c5e] [formerly 91a8e56302 [formerly 695f92db8aa698393bebfb4c2fed0bcf4d9d4efa]]]
Former-commit-id: 91a8e56302
Former-commit-id: 06004a0e08 [formerly 66f472ed37]
Former-commit-id: 8745f7acf1
2013-01-07 16:04:14 -06:00
Richard Peter
7ef0bc956c Merge "Issue #1431 - Fix Dual List filter problem." into development
Former-commit-id: bed085536e [formerly e329929bd2] [formerly bed085536e [formerly e329929bd2] [formerly 9ab999ed33 [formerly d0bcfbc3ce548ef84dff78ba50de8b44627bf8a8]]]
Former-commit-id: 9ab999ed33
Former-commit-id: 1cb120525b [formerly 13fac27c76]
Former-commit-id: 1f5f1c5950
2013-01-07 13:15:32 -06:00
Bryan Kowal
1996f92f7e Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606]
Former-commit-id: 0136f9d5a3
2013-01-07 12:16:01 -06:00
Mike Duff
08d438cdbc Issue #1431 - Fix Dual List filter problem.
Former-commit-id: 71ce5aa249 [formerly ace6214c3f] [formerly 71ce5aa249 [formerly ace6214c3f] [formerly 7eb980fd83 [formerly 0fc212dac04a4693060ee0e321c532a3f5076e01]]]
Former-commit-id: 7eb980fd83
Former-commit-id: 0014c1073a [formerly 4757feb616]
Former-commit-id: d72d3db542
2013-01-07 09:19:01 -06:00
Bryan Kowal
9d9f8bc837 Merge "Issue #1373 - prevent file naming conflicts" into development
Former-commit-id: 274aecc49b [formerly e6b9d5efa0] [formerly 274aecc49b [formerly e6b9d5efa0] [formerly 3128e0ae68 [formerly abc2790a82b6b6a80e7e958cd8c96dceaf78b860]]]
Former-commit-id: 3128e0ae68
Former-commit-id: 5efecb2e6b [formerly fc9ce23c7c]
Former-commit-id: 838c77bca1
2013-01-05 10:41:54 -06:00
Bryan Kowal
7138f2a20f Issue #1373 - prevent file naming conflicts
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: 94fe1c8f59 [formerly 9079c2dd3f] [formerly 94fe1c8f59 [formerly 9079c2dd3f] [formerly 2c9e5d68fa [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 5aed64be97 [formerly 6580901b03]
Former-commit-id: ad30a7fb6a
2013-01-05 10:40:10 -06:00
Richard Peter
358b09b0d2 Merge "Issue #1451 Allow overriding of IUserManager via ServiceLoader." into development
Former-commit-id: 0923729898 [formerly 4fe4daf973] [formerly 0923729898 [formerly 4fe4daf973] [formerly 36c31ce6df [formerly a1f84dbd0a1ef95c0303119f152396aaed6fcb16]]]
Former-commit-id: 36c31ce6df
Former-commit-id: 2029ea53b8 [formerly 6457ab4bdb]
Former-commit-id: a60d057a2a
2013-01-04 13:31:48 -06:00
Bryan Kowal
a14d25ded0 Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
Former-commit-id: 2d9e54ddf8 [formerly 9062ed93d7] [formerly 2d9e54ddf8 [formerly 9062ed93d7] [formerly e131b5bc72 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]
Former-commit-id: e131b5bc72
Former-commit-id: ce21e23e52 [formerly 8a4bc85bad]
Former-commit-id: d2cd60bb5c
2013-01-04 12:50:37 -06:00
Dustin Johnson
3d9c459c10 Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: f5f6884b79 [formerly 452729a647] [formerly f5f6884b79 [formerly 452729a647] [formerly 19f1b30437 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]
Former-commit-id: 19f1b30437
Former-commit-id: cdf08ea65a [formerly 818664e557]
Former-commit-id: a29d38f5f9
2013-01-04 12:34:43 -06:00
Richard Peter
e8d1469a70 Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: af5b616282 [formerly 1c560f5013] [formerly af5b616282 [formerly 1c560f5013] [formerly c1765f776c [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]
Former-commit-id: c1765f776c
Former-commit-id: 9f991104dd [formerly 424cb12ef6]
Former-commit-id: 6fd64a20fa
2013-01-03 16:27:32 -06:00
Ben Steffensmeier
27bd5ba7b8 Issue #1450 apply opposite scanning before flipping in grib decoder
Former-commit-id: 03f9d510fe [formerly 6a8066f3d4] [formerly 03f9d510fe [formerly 6a8066f3d4] [formerly a3bfb8a14e [formerly ce2095697f1f00656bf6b778e565d708ddc6a29c]]]
Former-commit-id: a3bfb8a14e
Former-commit-id: 0102bdc392 [formerly e1bc52b1d8]
Former-commit-id: 1c472994ef
2013-01-03 11:44:13 -06:00
Dustin Johnson
1bc5b09603 Issue #1449 Add interface in front of VizApp task running methods
Change-Id: I4696782d800a836f347cf72738c6c0673314a492

Former-commit-id: f6e081d331 [formerly b9c9030d05] [formerly f6e081d331 [formerly b9c9030d05] [formerly dc61af2dea [formerly 3ed5c31344148559c0e5479f4b7955fcee7cb0a7]]]
Former-commit-id: dc61af2dea
Former-commit-id: 853ea19014 [formerly 19cdf2f57c]
Former-commit-id: 05951d66c6
2013-01-02 11:01:15 -06:00
Richard Peter
be9e052dc3 Merge "Issue #1438 move all gfe processing out of the grib plugin." into development
Former-commit-id: f8f34c268d [formerly cadd463843] [formerly f8f34c268d [formerly cadd463843] [formerly 76ef2ae454 [formerly 87c31ed4792c0270f3166b0b69ce64d0bca1464b]]]
Former-commit-id: 76ef2ae454
Former-commit-id: 9cddcffb4b [formerly d3053692b5]
Former-commit-id: c604ec186f
2012-12-21 14:03:04 -06:00
Nate Jensen
0b60945017 Merge "Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor." into development
Former-commit-id: c12b081dd5 [formerly af67ccef2e] [formerly c12b081dd5 [formerly af67ccef2e] [formerly d4ed7f5b06 [formerly 04cd8a3390e6615ec2c3abdbd5ba24652c6b54da]]]
Former-commit-id: d4ed7f5b06
Former-commit-id: 10b4bdf1cb [formerly b1972e519d]
Former-commit-id: f7ca60ad57
2012-12-21 13:41:12 -06:00
Richard Peter
d58d5fbc2b Merge "Issue #1445 fix time range for accumulations" into development
Former-commit-id: f169ff1a6d [formerly 4512f39b31] [formerly f169ff1a6d [formerly 4512f39b31] [formerly 312f5ea6c3 [formerly 3057efc842920e3843a90005d4166c5b5d4814a6]]]
Former-commit-id: 312f5ea6c3
Former-commit-id: d2b6381d85 [formerly 7ac93e7ea3]
Former-commit-id: 4d7cb47c65
2012-12-21 10:14:10 -06:00
Max Schenkelberg
d0a39b6c17 Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor.
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: 08160fff31 [formerly fabb9bbcff] [formerly 08160fff31 [formerly fabb9bbcff] [formerly 7e3273db95 [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]]
Former-commit-id: 7e3273db95
Former-commit-id: 3a1106efa0 [formerly 904270b99b]
Former-commit-id: 09f1499af9
2012-12-20 17:14:34 -06:00
Ben Steffensmeier
3b9f1b2ae2 Issue #1445 fix time range for accumulations
Former-commit-id: e7db0f009c [formerly 144ddacb07] [formerly e7db0f009c [formerly 144ddacb07] [formerly bb557546bf [formerly 590d927da3f051ed033c41bc0c89108a25826759]]]
Former-commit-id: bb557546bf
Former-commit-id: 2a2f226b92 [formerly 403381dde1]
Former-commit-id: e80deb958f
2012-12-19 15:14:03 -06:00
Ben Steffensmeier
8af25f1870 Issue #1425 make contouring handle NaN better.
Former-commit-id: a1bda65a85 [formerly 1588e1b194] [formerly a1bda65a85 [formerly 1588e1b194] [formerly b4f100da04 [formerly c090b012a6fafb8816f0c17c1af6f14774f08d83]]]
Former-commit-id: b4f100da04
Former-commit-id: a7c1e74ac2 [formerly 06ae24cf4f]
Former-commit-id: 45d4ef7ea5
2012-12-19 13:23:28 -06:00
Ben Steffensmeier
f62c7fde9b Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: b312bce5ad [formerly 521924904a] [formerly b312bce5ad [formerly 521924904a] [formerly fe0a8b60c6 [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]]]
Former-commit-id: fe0a8b60c6
Former-commit-id: ca4e39df79 [formerly c6032b1950]
Former-commit-id: 7d19f5e38f
2012-12-19 11:26:40 -06:00
Richard Peter
cec63c30c7 Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
Former-commit-id: 314bcffd15 [formerly c3e9f40479] [formerly 314bcffd15 [formerly c3e9f40479] [formerly 45f901c1b0 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]
Former-commit-id: 45f901c1b0
Former-commit-id: a608ba1a88 [formerly 54778e7490]
Former-commit-id: 7c4641be8e
2012-12-18 13:08:40 -06:00
Greg Armendariz
30aea5c68d Merge "Issue #1416: added the python package shapely" into development
Former-commit-id: 75ed78667c [formerly 241db36518] [formerly 75ed78667c [formerly 241db36518] [formerly 2b5e44ff99 [formerly 85b378ef77ba7721e85327a1f0645e1a8eaa1d07]]]
Former-commit-id: 2b5e44ff99
Former-commit-id: 1beb1152e7 [formerly 770ff8c4d2]
Former-commit-id: aecd76044d
2012-12-18 09:27:03 -06:00
Roger Ferrel
7143fb78dd Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: 8c4e70fa9a [formerly 0c5d10e66a] [formerly 8c4e70fa9a [formerly 0c5d10e66a] [formerly 43fd607a30 [formerly c1567c66f77077f9411a04f349a17d368424db5f]]]
Former-commit-id: 43fd607a30
Former-commit-id: 07fbeb2928 [formerly 6d4946290f]
Former-commit-id: 95e6d9e752
2012-12-18 09:00:46 -06:00
Max Schenkelberg
7f708ac427 Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 14f102d8ae [formerly b4952b003a] [formerly 14f102d8ae [formerly b4952b003a] [formerly 373de78320 [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]
Former-commit-id: 373de78320
Former-commit-id: 886c39f5a4 [formerly adf6aed592]
Former-commit-id: c18d3486eb
2012-12-17 17:05:34 -06:00
Bryan Kowal
f48df7de50 Issue #1416: added the python package shapely
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: ef0b12813d [formerly 8d1e29448a] [formerly ef0b12813d [formerly 8d1e29448a] [formerly 5e22c24657 [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]
Former-commit-id: 5e22c24657
Former-commit-id: 976834171e [formerly 6103e7c485]
Former-commit-id: bf96e5cf59
2012-12-17 15:27:43 -06:00
Richard Peter
4057b2f0ef Merge "Issue #1262:" into development
Former-commit-id: 0268ccd3a3 [formerly dc528d3e14] [formerly 0268ccd3a3 [formerly dc528d3e14] [formerly c4028fe005 [formerly 6ad2bed46b41a9071f6a7ef70ae267d57e824e1d]]]
Former-commit-id: c4028fe005
Former-commit-id: 35ff18eb2e [formerly ce427112a9]
Former-commit-id: 1ccf02fa4c
2012-12-17 12:20:50 -06:00
Nate Jensen
995f614e67 Merge "Issue #1369 fix reproject geotiffs" into development
Former-commit-id: 0a262d7716 [formerly ed075faf68] [formerly 0a262d7716 [formerly ed075faf68] [formerly 0316240cf6 [formerly 310f0e9e274ded8256d6b644ade33cea427638f0]]]
Former-commit-id: 0316240cf6
Former-commit-id: 937220f430 [formerly 65dc6cbd0e]
Former-commit-id: 43c5037070
2012-12-17 12:14:07 -06:00
Matt Nash
fabcff6dd5 Issue #1369 fix reproject geotiffs
Change-Id: I576fa38e88afc95914db26c9232acb9e9d3bd6ce

Former-commit-id: 159265e53e [formerly 2ed0f446d9] [formerly 159265e53e [formerly 2ed0f446d9] [formerly 323e97d617 [formerly 6b06041578eb02e8955ab7d614e2574b5838181e]]]
Former-commit-id: 323e97d617
Former-commit-id: c4c8221582 [formerly c3d94429f7]
Former-commit-id: 31d4a3c2af
2012-12-17 11:31:20 -06:00
Bryan Kowal
7e19ae6378 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 7fb4e993e6 [formerly 660a9b615f] [formerly 7fb4e993e6 [formerly 660a9b615f] [formerly f39489c44c [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]
Former-commit-id: f39489c44c
Former-commit-id: 8579adf932 [formerly c44c4bd061]
Former-commit-id: f256955776
2012-12-16 21:40:26 -06:00
Richard Peter
5faf3a22bd Revert "Issue #1262:"
This reverts commit 95a0a4664f [formerly 83e1f8cc0a] [formerly bad53d1b7f [formerly 9490652103]] [formerly 0970259114] [formerly c3da463f39 [formerly a210f08acc] [formerly c3da463f39 [formerly a210f08acc] [formerly 0970259114 [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]


Former-commit-id: 9d03a53fb5 [formerly 9a7cfa2383] [formerly 9d03a53fb5 [formerly 9a7cfa2383] [formerly f37f948456 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]
Former-commit-id: f37f948456
Former-commit-id: 2100b136a9 [formerly 48641ca26f]
Former-commit-id: 463f7c5d9b
2012-12-16 20:37:21 -06:00
Richard Peter
a309307d51 Merge "Issue #1428: Optimize deserialize to directly lookup set method" into development
Former-commit-id: 8d28163deb [formerly 76e643e876] [formerly 8d28163deb [formerly 76e643e876] [formerly b0d47ed420 [formerly a5d9b113bbf644a613015fe593f4b9d4070ab167]]]
Former-commit-id: b0d47ed420
Former-commit-id: 9007b1c424 [formerly 0295be792f]
Former-commit-id: e696e879e0
2012-12-14 17:38:41 -06:00
Richard Peter
7262a2ef05 Issue #1428: Optimize deserialize to directly lookup set method
Change-Id: I8efb8ea6d67a42e5e2b1f2e6587a2fcd785df914

Former-commit-id: db24b1c2fa [formerly a4d36258d0] [formerly db24b1c2fa [formerly a4d36258d0] [formerly 061104acf1 [formerly 33ecdcf14de180606cb487e13aa940e913a8a405]]]
Former-commit-id: 061104acf1
Former-commit-id: 35f6d17680 [formerly 279fb8d21f]
Former-commit-id: a754bee29d
2012-12-14 17:37:50 -06:00
Richard Peter
587707ded9 Merge "Issue #1262:" into development
Former-commit-id: e3ffce8228 [formerly d091159ef2] [formerly e3ffce8228 [formerly d091159ef2] [formerly 70d2347dca [formerly cea057d02c0eba841295a25abce31ea17022e2e9]]]
Former-commit-id: 70d2347dca
Former-commit-id: 0f41a375b2 [formerly cd9fa8e508]
Former-commit-id: aa2b9c3f74
2012-12-14 10:07:31 -06:00
Jonathan Sanchez
937f3212f9 Issue #1424 Removed coordinate truncate when adding vertex.
Former-commit-id: 8e83a6ea6d [formerly ccc37dc454] [formerly 8e83a6ea6d [formerly ccc37dc454] [formerly 351148804c [formerly 5531ffd29021d7e0db627f2c59ad7ef6de71a896]]]
Former-commit-id: 351148804c
Former-commit-id: c4e044d7b9 [formerly 61f80591bb]
Former-commit-id: 88e931376e
2012-12-14 07:42:39 -06:00
Ron Anderson
d176bc1e2f Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
Former-commit-id: e49ea6c147 [formerly 6f79ba14e6] [formerly e49ea6c147 [formerly 6f79ba14e6] [formerly c17e0a19c9 [formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]]]
Former-commit-id: c17e0a19c9
Former-commit-id: bf7960b5f9 [formerly cb4721ae15]
Former-commit-id: 5c59df1ae1
2012-12-13 15:47:04 -06:00
Ron Anderson
c341ac0f55 Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: 3e4aeeab8b [formerly 753fa0487b] [formerly 3e4aeeab8b [formerly 753fa0487b] [formerly 639b5abbd9 [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]]
Former-commit-id: 639b5abbd9
Former-commit-id: 8b81f0bfb4 [formerly 995f28220a]
Former-commit-id: 676819adfa
2012-12-13 15:25:24 -06:00
Nate Jensen
2b93ece40d Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
Former-commit-id: acccca74eb [formerly 67d30566c0] [formerly acccca74eb [formerly 67d30566c0] [formerly 823bedcebd [formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]]]
Former-commit-id: 823bedcebd
Former-commit-id: 31d8e9a9ae [formerly 0388c1b179]
Former-commit-id: 6ac9952901
2012-12-13 14:25:56 -06:00
Lee Venable
6002363f85 Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
Former-commit-id: fabb15ab10 [formerly d098b2e271] [formerly fabb15ab10 [formerly d098b2e271] [formerly 3ca1080fa0 [formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]]]
Former-commit-id: 3ca1080fa0
Former-commit-id: 2c29835b63 [formerly 1be8e81228]
Former-commit-id: d202b932b3
2012-12-13 14:24:55 -06:00
Nate Jensen
c1c0b738e0 Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
Former-commit-id: c2bc33e51a [formerly f0340fba98] [formerly c2bc33e51a [formerly f0340fba98] [formerly 59f315f14b [formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]]]
Former-commit-id: 59f315f14b
Former-commit-id: ceceed5b27 [formerly e5ad2acde4]
Former-commit-id: af1c73a788
2012-12-13 14:13:57 -06:00
Roger Ferrel
946b0f7477 Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873

Former-commit-id: 9d770cf725 [formerly 65699f7a26] [formerly 9d770cf725 [formerly 65699f7a26] [formerly 77c60c8925 [formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]]]
Former-commit-id: 77c60c8925
Former-commit-id: d3482bd513 [formerly 258dd80db8]
Former-commit-id: e78f65e222
2012-12-13 13:50:47 -06:00