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

25 commits

Author SHA1 Message Date
Steve Harris
58037cb5d1 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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
 2012-05-09 13:14:00 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline 
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
 2012-05-01 18:06:13 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline 
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
6812c1ba2b Issue #239 Fixed D2D context activation so as not to override important 
keys when a unrelated view is active such as Product Browser or
Collaboration views.

Former-commit-id: c7badfd1c2a77d410cd3b841fef967c07c9e6434
 2012-04-06 10:23:24 -05:00
Max Schenkelberg
16056d53c5 Issue #239 Added remote capability injection code through factory 
method. Cleaned up old/unmaintained 3D references

Former-commit-id: e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca
 2012-04-05 13:52:20 -05:00
Steve Harris
22bd792cd9 12.3.1-10 baseline 
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
 2012-03-30 08:38:33 -05:00
Steve Harris
a0abcf8120 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
 2012-03-29 10:03:05 -05:00
David Gillingham
494fbe93db Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: e2c66b33fd8c71b0da6518c419296ab8141a07e3
 2012-03-05 11:23:11 -06:00
David Gillingham
0c0f659896 Issue #346: Convert GFE to use identity-based ListenerLists, increase 
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 5fc74409511903afa97949bc3cd1b3acf91c35e0
 2012-03-02 13:22:46 -06:00
Steve Harris
787aed90f8 Merge branch 'ss_sync' into sync_test 
Former-commit-id: 7ebcf63686d75d58f8bfea92e825edaf49a30df1
 2012-03-01 14:01:16 -06:00
David Gillingham
5aa5b51a55 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor. 
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: b6d7661be725d8a37a8294b0eda982208c35ecbe
 2012-02-23 14:40:25 -06:00
David Gillingham
85998bc654 Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs. 
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: 67aaf1c21e8372b4a84cb82cae62549502992651
 2012-02-23 13:23:59 -06:00
Steve Harris
86e586befe 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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
 2012-02-23 12:38:55 -06:00
Steve Harris
7a10ca9766 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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
 2012-02-23 10:06:18 -06:00
Steve Harris
54be9660f1 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
 2012-02-22 11:14:43 -06:00
Steve Harris
5e9d2dd367 Merge branch '10-Tech_Blocked' into 104-integration 
Conflicts:
	edexOsgi/build.edex/deploy-install.xml
	rpms/awips2.edex/Installer.edex-cots/component.spec

Former-commit-id: f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce
 2012-02-20 13:03:39 -06:00
Steve Harris
d02529fef4 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked 
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
 2012-02-20 12:54:25 -06:00
Steve Harris
cc66c8be24 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client 
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
 2012-02-20 12:43:38 -06:00
Steve Harris
b137302802 Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
 2012-02-17 10:55:02 -06:00
Steve Harris
f693b6d0a7 Merge branch '10-Tech_Blocked' into 104-integration 
Former-commit-id: d31ccf5832bf2b2ccfe29126deb4da80806c6739
 2012-02-09 08:54:18 -06:00
Max Schenkelberg
e422b13ded Issue #206 Made tear off menu dialog activate contexts for perspective 
Former-commit-id: 56103eb133de5325d62bb3453b2353e5d5e23ddd
 2012-02-01 17:03:20 -06:00
Ben Steffensmeier
9b78596436 Issue #227 enhanced caching of maps for thin client 
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 067ba5b7d28174d99119d5bf87a28334578f78dd
 2012-01-31 10:53:10 -06:00
Matt Nash
4286cb0342 Issue #26 add tear off code to git baseline 
Former-commit-id: dedac216cfa51bd413f7c4d1f7db5ee8ce665866
 2012-01-25 12:50:31 -06:00
Matt Nash
c83e5ff474 Moving 12.1.1 into ss_sync 
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
 2012-01-19 11:53:12 -06:00
root
06a8b51d6d Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
 2012-01-06 08:55:05 -06:00