Nate Jensen
e839afd355
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
...
Former-commit-id: 4d32c5e078
[formerly d40b15acc2
] [formerly 4d32c5e078
[formerly d40b15acc2
] [formerly d09c8a9383
[formerly 9dc29b49a619cca5613e72858099029b4ffc724e]]]
Former-commit-id: d09c8a9383
Former-commit-id: 4a2d3cd071
[formerly f95cba545b
]
Former-commit-id: 4653f3dd4f
2012-03-27 08:36:15 -05:00
Nate Jensen
009ae65184
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
...
Former-commit-id: 4073ba7e7d
[formerly 978b76066c
] [formerly 4073ba7e7d
[formerly 978b76066c
] [formerly ed44b0d93f
[formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]]]
Former-commit-id: ed44b0d93f
Former-commit-id: d62fc78291
[formerly 8b06b02281
]
Former-commit-id: 0805c13d39
2012-03-27 08:32:19 -05:00
Roger Ferrel
027e4f4254
Issue #244 Tied CollaboratonEditor to the view.
...
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: 76f9c71d41
[formerly a270259553
] [formerly 76f9c71d41
[formerly a270259553
] [formerly d001287c94
[formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]]]
Former-commit-id: d001287c94
Former-commit-id: 8dae356572
[formerly 26122319db
]
Former-commit-id: ebbf625538
2012-03-26 17:30:51 -05:00
Roger Ferrel
cca7866880
Issue #244 Localization of login data and removal of messanger and participant listeners.
...
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: df5a2662ba
[formerly b180f9b45e
] [formerly df5a2662ba
[formerly b180f9b45e
] [formerly 95d8d85fd0
[formerly 4e4a705b98070d2e671133e6acc29dc72617505a]]]
Former-commit-id: 95d8d85fd0
Former-commit-id: c132fbf641
[formerly 8f75dd68de
]
Former-commit-id: c06762598e
2012-03-26 17:30:50 -05:00
James Korman
0d10f43adb
Issue #232 - Added JAXB serialization support
...
Former-commit-id: fc2bd8c666
[formerly 72e9c2eb52
] [formerly fc2bd8c666
[formerly 72e9c2eb52
] [formerly 221a5a65b0
[formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]]]
Former-commit-id: 221a5a65b0
Former-commit-id: eff90a5c4b
[formerly 02bbe80c7c
]
Former-commit-id: 745f256590
2012-03-26 16:48:04 -05:00
Nate Jensen
e9f2d75d95
Issue #427 event controllers use ISharedDisplaySession
...
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: ef03821455
[formerly f6226a89d9
] [formerly ef03821455
[formerly f6226a89d9
] [formerly cbf105015f
[formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]
Former-commit-id: cbf105015f
Former-commit-id: ff5fec3f09
[formerly e28fc62a56
]
Former-commit-id: b6be43d0e5
2012-03-26 16:37:44 -05:00
Nate Jensen
4605f1b00a
Issue #427 fix xml serialization
...
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654
Former-commit-id: e24039ae5c
[formerly 7c6e0a41f7
] [formerly e24039ae5c
[formerly 7c6e0a41f7
] [formerly 2a1e40b2d5
[formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]]]
Former-commit-id: 2a1e40b2d5
Former-commit-id: ecc3dc9a70
[formerly a1e2c3173d
]
Former-commit-id: c8b94860a0
2012-03-26 15:47:34 -05:00
Nate Jensen
6580f92e65
Issue #427 initial role based event handling
...
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb
Former-commit-id: bac31f3613
[formerly 4d7a53c583
] [formerly bac31f3613
[formerly 4d7a53c583
] [formerly 619d19e24c
[formerly b752ced02d726771a6e11a9982967a892d2e55f3]]]
Former-commit-id: 619d19e24c
Former-commit-id: 998c9df260
[formerly 62b16fef0d
]
Former-commit-id: 2e4e000720
2012-03-26 13:05:01 -05:00
James Korman
551d38bee3
Issue #232 : Large refactor - Add command interfaces
...
Former-commit-id: 5bb4a7952b
[formerly e408ed1a28
] [formerly 5bb4a7952b
[formerly e408ed1a28
] [formerly d51a8521f8
[formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]]]
Former-commit-id: d51a8521f8
Former-commit-id: fb0614ad9e
[formerly e83de7447b
]
Former-commit-id: 61f8b804cb
2012-03-26 10:17:17 -05:00
Roger Ferrel
ff4822d3ef
Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
...
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102
Former-commit-id: cd66a9c29c
[formerly 04b5a92838
] [formerly cd66a9c29c
[formerly 04b5a92838
] [formerly ce72b7b583
[formerly a264abfff059a9c5942ef1db91a6390fad12a110]]]
Former-commit-id: ce72b7b583
Former-commit-id: e649f9da42
[formerly 053c4ba597
]
Former-commit-id: 3f08de49fd
2012-03-22 16:57:30 -05:00
Nate Jensen
28931de3c6
Issue #427 Share maps and editor
...
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 37d4401747
[formerly 615962f5dd
] [formerly 37d4401747
[formerly 615962f5dd
] [formerly 0e214bcd7c
[formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 8d94771854
[formerly 2801c4fdfb
]
Former-commit-id: 98fb91164b
2012-03-22 09:39:59 -05:00
James Korman
5702fc837c
Issue #232 - Delete files from original locations
...
Former-commit-id: 4dabfd8c2a
[formerly 90b74b258a
] [formerly 4dabfd8c2a
[formerly 90b74b258a
] [formerly 55f269100c
[formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]
Former-commit-id: 55f269100c
Former-commit-id: d0976e4703
[formerly 9badd0fb07
]
Former-commit-id: f3f6778df2
2012-03-20 14:55:27 -05:00
James Korman
9d51b9c893
Issue #232 - Considerable refactoring/event processing
...
Former-commit-id: 60ff4d139b
[formerly 4ba4ccb404
] [formerly 60ff4d139b
[formerly 4ba4ccb404
] [formerly cc5cc2d409
[formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]]
Former-commit-id: cc5cc2d409
Former-commit-id: 8be6351348
[formerly c5e9df26c1
]
Former-commit-id: 7f895ac63d
2012-03-20 13:59:55 -05:00
Roger Ferrel
3d8af5815a
Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
...
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687
Former-commit-id: ce3b5728c5
[formerly 1f4edd08e4
] [formerly ce3b5728c5
[formerly 1f4edd08e4
] [formerly a7f1fc18b1
[formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]]
Former-commit-id: a7f1fc18b1
Former-commit-id: 002e7eab3f
[formerly 9f6642d572
]
Former-commit-id: f58fa980f2
2012-03-20 10:42:57 -05:00
Max Schenkelberg
8878a9732d
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: 468c812dde
[formerly cd6ebd80d4
] [formerly 468c812dde
[formerly cd6ebd80d4
] [formerly b9085db25d
[formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 81bc45f071
[formerly 954073b38c
]
Former-commit-id: 645900727c
2012-03-16 10:13:31 -05:00
Max Schenkelberg
e220ddf515
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 97edff9f7c
[formerly cc111ab9ac
] [formerly 97edff9f7c
[formerly cc111ab9ac
] [formerly 258d57e825
[formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 4e81d2432c
[formerly 1e5c074e3b
]
Former-commit-id: a3bda1957c
2012-03-16 09:03:50 -05:00
Max Schenkelberg
d585d19f48
Issue #358 Fixed painting and sampling regression in radar mosaic due to
...
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements
Former-commit-id: 10b720381b
[formerly 719f87c261
] [formerly 10b720381b
[formerly 719f87c261
] [formerly 556a270a09
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54
[formerly ba8af4dcc1
]
Former-commit-id: 682aca1dda
2012-03-14 18:03:44 -05:00
Nate Jensen
8e796d06de
Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
...
Former-commit-id: feeb8cba7e
[formerly 8f8e690470
] [formerly feeb8cba7e
[formerly 8f8e690470
] [formerly dc62171533
[formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]
Former-commit-id: dc62171533
Former-commit-id: 77a50a5e25
[formerly 8d78571942
]
Former-commit-id: 7f88a56232
2012-03-14 11:23:55 -05:00
Matt Nash
1236a90d7e
Issue #244 icons and login changes
...
Former-commit-id: f5c9cfd285
[formerly e06101f9c3
] [formerly f5c9cfd285
[formerly e06101f9c3
] [formerly 2fd6e28569
[formerly ef2993a8545265adbc325080765baef0ee939923]]]
Former-commit-id: 2fd6e28569
Former-commit-id: d6ef74a95b
[formerly 5b949aeacf
]
Former-commit-id: ab5e4cb2de
2012-03-14 10:54:13 -05:00
James Korman
0d4ccaf2e6
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
...
Former-commit-id: ee20250305
[formerly 095ab0eeab
] [formerly ee20250305
[formerly 095ab0eeab
] [formerly d6003d1e71
[formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: d6003d1e71
Former-commit-id: 578594cdfd
[formerly b29c262362
]
Former-commit-id: 072c79a582
2012-03-14 10:24:17 -05:00
Max Schenkelberg
9366a5f308
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 8fb7eccb73
[formerly 6e5964df9d
] [formerly 8fb7eccb73
[formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7
[formerly cf440b3884
]
Former-commit-id: 6378e8c4ee
2012-03-14 09:49:32 -05:00
Roger Ferrel
69552760cd
Issue #244 Close Session connction when view closed. Tighen up dialogs.
...
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5
Former-commit-id: 186aac5b77
[formerly 97a3884017
] [formerly 186aac5b77
[formerly 97a3884017
] [formerly c321d2aacf
[formerly 486b2186014a14a845e48dac222c293a7891e39e]]]
Former-commit-id: c321d2aacf
Former-commit-id: a64f2e6070
[formerly b21f1555e2
]
Former-commit-id: 8474561724
2012-03-14 09:26:23 -05:00
Steve Harris
749ee2f4f4
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
...
Former-commit-id: 6d2af585b1
[formerly 5bbf80a384
] [formerly 6d2af585b1
[formerly 5bbf80a384
] [formerly 10dc140747
[formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]]]
Former-commit-id: 10dc140747
Former-commit-id: 7fc8cf3d94
[formerly 7bdde9f690
]
Former-commit-id: a97a9f80c9
2012-03-12 13:10:34 -05:00
Matt Nash
164c1d3715
Issue #244 new icons for collaboration
...
Former-commit-id: 6398c01aec
[formerly 79f1cbec74
] [formerly 6398c01aec
[formerly 79f1cbec74
] [formerly 39bce3d793
[formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]
Former-commit-id: 39bce3d793
Former-commit-id: c743c0c44b
[formerly 22eb44eb26
]
Former-commit-id: cd16dd73a4
2012-03-12 08:03:54 -05:00
Max Schenkelberg
0f005d3521
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7
[formerly d43b0456d8
] [formerly 18805c68f7
[formerly d43b0456d8
] [formerly 89f603f448
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb
[formerly 4662ece060
]
Former-commit-id: 1303289d12
2012-03-09 12:31:50 -06:00
Roger Ferrel
c828bfb110
Issue #244 Bug Fix.
...
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c
Former-commit-id: 1871be89e7
[formerly be9fe19d9a
] [formerly 1871be89e7
[formerly be9fe19d9a
] [formerly d17ef23899
[formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]]
Former-commit-id: d17ef23899
Former-commit-id: e8887a6189
[formerly 6c8db0d6a4
]
Former-commit-id: c692a2da94
2012-03-08 17:16:48 -06:00
Roger Ferrel
59c235974b
Issue #244 Added join and refresh actions.
...
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20
Former-commit-id: 71a5524380
[formerly f492b082dc
] [formerly 71a5524380
[formerly f492b082dc
] [formerly f04f775a66
[formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]
Former-commit-id: f04f775a66
Former-commit-id: d6a4919b9a
[formerly 674cc116b2
]
Former-commit-id: 31c8dddd6c
2012-03-08 12:37:56 -06:00
Matt Nash
f060c674d7
Issue #244 added work on the chat for presence notifications
...
Former-commit-id: c96c33169b
[formerly d264743199
] [formerly c96c33169b
[formerly d264743199
] [formerly 6f354374d6
[formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: 6f354374d6
Former-commit-id: b4a5aaea11
[formerly 4f35191a6b
]
Former-commit-id: 825570f37c
2012-03-08 09:08:41 -06:00
Matt Nash
347a36704a
Merge "Issue #244 update" into 11-Collaboration
...
Former-commit-id: 1e4472cd78
[formerly 04ae9b48ea
] [formerly 1e4472cd78
[formerly 04ae9b48ea
] [formerly bbacd337b4
[formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: bbacd337b4
Former-commit-id: dd57ff6b7f
[formerly 7efd993e18
]
Former-commit-id: 9ec70444da
2012-03-08 08:33:32 -06:00
Roger Ferrel
12df2e3f0b
Issue #244 update
...
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105
Former-commit-id: c22d5ef573
[formerly c9459e2e8c
] [formerly c22d5ef573
[formerly c9459e2e8c
] [formerly 2114b95a0b
[formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: 2114b95a0b
Former-commit-id: 40b910c05e
[formerly 1a2608a2fa
]
Former-commit-id: 890f2bffb9
2012-03-08 08:30:02 -06:00
James Korman
fe7db93589
Issue #232 Initial collaboration framework plugin checkin
...
Former-commit-id: 4368616970
[formerly 526a2633ce
] [formerly 4368616970
[formerly 526a2633ce
] [formerly 5a91d71c12
[formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 5a91d71c12
Former-commit-id: f242c1a430
[formerly 2fea86a591
]
Former-commit-id: e40ee702aa
2012-03-07 15:38:20 -06:00
Nate Jensen
9c3c717032
Merge "Issue #244 Inital creation" into 11-Collaboration
...
Former-commit-id: 13228ab7cc
[formerly f950b30463
] [formerly 13228ab7cc
[formerly f950b30463
] [formerly 412ceb9561
[formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]
Former-commit-id: 412ceb9561
Former-commit-id: 39f89588a1
[formerly d0672cf2b6
]
Former-commit-id: 54ab82c837
2012-03-06 14:27:15 -06:00
Roger Ferrel
192093aa37
Issue #244 Inital creation
...
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4
Former-commit-id: c62418dcf3
[formerly c26e98376e
] [formerly c62418dcf3
[formerly c26e98376e
] [formerly 3161380f4d
[formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]
Former-commit-id: 3161380f4d
Former-commit-id: 0cf600a16c
[formerly ccfadae952
]
Former-commit-id: 8395a3937e
2012-03-06 14:08:39 -06:00
David Gillingham
678953ae76
Issue #354 : Refactor AbstractParmManager to better handle ISC parm
...
pre-loading.
Former-commit-id: 1908212c27
[formerly d68e3a7eea
] [formerly 1908212c27
[formerly d68e3a7eea
] [formerly 494fbe93db
[formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]
Former-commit-id: 494fbe93db
Former-commit-id: 29f03b0d2a
[formerly bc61eb1e43
]
Former-commit-id: ad8efe180e
2012-03-05 11:23:11 -06:00
David Gillingham
0b79b9ea21
Issue #346 : Convert GFE to use identity-based ListenerLists, increase
...
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.
Former-commit-id: bd01975367
[formerly f6f0ca24df
] [formerly bd01975367
[formerly f6f0ca24df
] [formerly 0c0f659896
[formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]
Former-commit-id: 0c0f659896
Former-commit-id: bce9ad39ae
[formerly b3df043f97
]
Former-commit-id: 788007ff63
2012-03-02 13:22:46 -06:00
Max Schenkelberg
ae389f0b57
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: e2cd95d3f4
[formerly ae47d9683e
] [formerly e2cd95d3f4
[formerly ae47d9683e
] [formerly 48b6d45f00
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0
[formerly 3212cc6ebb
]
Former-commit-id: 585e979c76
2012-03-01 16:59:40 -06:00
Steve Harris
cdc4d1cb44
Merge branch 'ss_sync' into sync_test
...
Former-commit-id: 3b9c3e3474
[formerly 951ecfe3dd
] [formerly 3b9c3e3474
[formerly 951ecfe3dd
] [formerly 787aed90f8
[formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]
Former-commit-id: 787aed90f8
Former-commit-id: b3f831a7b4
[formerly db45babec8
]
Former-commit-id: 376edad3c9
2012-03-01 14:01:16 -06:00
Steve Harris
9ce7c680d7
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 8794c4bcf6
[formerly c21bd2719c
] [formerly 8794c4bcf6
[formerly c21bd2719c
] [formerly 9bdea0399f
[formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]
Former-commit-id: 9bdea0399f
Former-commit-id: fe0b1eed94
[formerly 6f5c182af0
]
Former-commit-id: 6cdedca0a3
2012-03-01 13:19:04 -06:00
Ben Steffensmeier
4e0ec11a6f
Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request
...
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd
Former-commit-id: aa90109f45
[formerly 49cce84edf
] [formerly aa90109f45
[formerly 49cce84edf
] [formerly 7c2409eab0
[formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]
Former-commit-id: 7c2409eab0
Former-commit-id: f8c2ad7136
[formerly 3220ee4745
]
Former-commit-id: e0ad3aee33
2012-03-01 12:44:43 -06:00
Steve Harris
3306848158
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 98d1fbeb0e
[formerly 703cb6e748
] [formerly 98d1fbeb0e
[formerly 703cb6e748
] [formerly dd52eb4d40
[formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]
Former-commit-id: dd52eb4d40
Former-commit-id: 3e4d618486
[formerly 06baad5169
]
Former-commit-id: a4d8f58c90
2012-02-29 16:08:39 -06:00
Ben Steffensmeier
da7275d80b
Issue #353 add logic to syncronize times for thin client data updates..
...
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1
Former-commit-id: 56d97c95d5
[formerly 5c303ed189
] [formerly 56d97c95d5
[formerly 5c303ed189
] [formerly c61e40c426
[formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]
Former-commit-id: c61e40c426
Former-commit-id: 390700efb0
[formerly 84e6c9beb8
]
Former-commit-id: 588432f980
2012-02-29 15:49:47 -06:00
Ben Steffensmeier
f668495c76
Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
...
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f
Former-commit-id: 3713d7a181
[formerly 5dee50e7e9
] [formerly 3713d7a181
[formerly 5dee50e7e9
] [formerly d7a63995f1
[formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]
Former-commit-id: d7a63995f1
Former-commit-id: dba810ddc4
[formerly e52c2ffb20
]
Former-commit-id: 7d4367ee7a
2012-02-28 15:20:37 -06:00
Steve Harris
f8ae79c35c
Merge branch 'ss_sync' into 9-Wes2Bridge
...
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 24059a5b4e
[formerly 9b67525e95
] [formerly 24059a5b4e
[formerly 9b67525e95
] [formerly e5b56c99ab
[formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 73a337bc31
[formerly 40d7357165
]
Former-commit-id: 21f12bae82
2012-02-27 15:58:49 -06:00
Steve Harris
98c100b36f
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c45e7b888c
[formerly aa597242f9
] [formerly c45e7b888c
[formerly aa597242f9
] [formerly a4538f0a48
[formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]
Former-commit-id: a4538f0a48
Former-commit-id: 7c18ec7c7c
[formerly fdd6018d1a
]
Former-commit-id: ba4a6aa434
2012-02-27 11:32:49 -06:00
Ben Steffensmeier
cc91522fa0
Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target
...
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2
Former-commit-id: 20481daa1b
[formerly 357dc4d88b
] [formerly 20481daa1b
[formerly 357dc4d88b
] [formerly 637c051a23
[formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]
Former-commit-id: 637c051a23
Former-commit-id: 88d2d2e4b6
[formerly 62f1ea0aac
]
Former-commit-id: 0b4134f364
2012-02-24 14:57:23 -06:00
David Gillingham
98bc9450d3
Issue #346 : Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
...
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d
Former-commit-id: ef903bc728
[formerly d79f7e9613
] [formerly ef903bc728
[formerly d79f7e9613
] [formerly 5aa5b51a55
[formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: 6bca8d6353
[formerly f9ed20bada
]
Former-commit-id: 85c082f1e9
2012-02-23 14:40:25 -06:00
David Gillingham
ca09c3a75a
Issue #346 : Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
...
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 5a8ba0f0fb
[formerly 32b2c06988
] [formerly 5a8ba0f0fb
[formerly 32b2c06988
] [formerly 85998bc654
[formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: 9ff631305a
[formerly 88dcd4d09d
]
Former-commit-id: 8e123e3ae0
2012-02-23 13:23:59 -06:00
Steve Harris
93d99ca49c
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 4981170462
[formerly dcadf7baa4
] [formerly 4981170462
[formerly dcadf7baa4
] [formerly 86e586befe
[formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 4eb1ef5b0f
[formerly 938dc5b21c
]
Former-commit-id: 2c958713b6
2012-02-23 12:38:55 -06:00
Steve Harris
fd5ed23eb3
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: c0c0acfbe8
[formerly 957d232286
] [formerly c0c0acfbe8
[formerly 957d232286
] [formerly a82f2c5750
[formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 43b83ed8aa
[formerly e6c3afa7a2
]
Former-commit-id: 7f8343833e
2012-02-23 10:19:54 -06:00
Steve Harris
3aef320ffd
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 92084b3f20
[formerly d0bbbfefcc
] [formerly 92084b3f20
[formerly d0bbbfefcc
] [formerly 7a10ca9766
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82
[formerly 3d511fe719
]
Former-commit-id: ae9c52b012
2012-02-23 10:06:18 -06:00