Commit graph

589 commits

Author SHA1 Message Date
Steve Harris
1ad64ffa98 12.6.1-5 baseline
Former-commit-id: 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]
Former-commit-id: c99afab05f
Former-commit-id: 09f73b0601
2012-06-11 16:23:47 -05:00
Steve Harris
bc96eba820 12.6.1-3 baseline
Former-commit-id: d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]
Former-commit-id: 42f3513175
Former-commit-id: 7c5306b795
2012-06-11 16:23:47 -05:00
Steve Harris
2f10c7a1e4 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
2012-06-08 13:39:48 -05:00
Max Schenkelberg
f7dfbc11f1 Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10

Former-commit-id: 6a0ed72e5e [formerly 7d5d086fe1 [formerly 695134c3139868d6e9ace9dca7757368e0bfa5ec]]
Former-commit-id: 7d5d086fe1
Former-commit-id: 0adccb8b12
2012-06-07 09:44:40 -05:00
Matt Nash
45cb41faed Issue #659 fix GFE issue with mouse handlers
Former-commit-id: ed0b70501f [formerly c4d26f8b1b [formerly 43f277de57d148c2d742266d8346b9b93cbcb82f]]
Former-commit-id: c4d26f8b1b
Former-commit-id: 0e3b539ada
2012-06-06 14:13:55 -05:00
Max Schenkelberg
d1f1f5106c Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35

Former-commit-id: fbd269f4c7 [formerly b8bedd1247 [formerly 6588f58c80782f793c3621a2fd7ec81be2d1ead2]]
Former-commit-id: b8bedd1247
Former-commit-id: 2750c4ba08
2012-06-06 12:05:47 -05:00
Max Schenkelberg
603726498f Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard

Former-commit-id: 8b87b6a0a1 [formerly b5da470e0a [formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]
Former-commit-id: b5da470e0a
Former-commit-id: f0e2ef8c91
2012-06-05 16:43:27 -05:00
Max Schenkelberg
2374bc2d88 Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5

Former-commit-id: 52a78af98c [formerly e81a9ee935 [formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]]
Former-commit-id: e81a9ee935
Former-commit-id: 4c0a18894c
2012-05-22 09:56:27 -05:00
Steve Harris
45773fbee0 12.5.1-9 baseline
Former-commit-id: 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 8f3c9ebfb7
Former-commit-id: b8de76b45e
2012-05-21 17:48:55 -05:00
Steve Harris
ba6d779949 12.5.1-6 baseline
Former-commit-id: fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: 24474489f9
Former-commit-id: df80148db6
2012-05-16 16:41:22 -05:00
Nate Jensen
853a83c753 Issue #590 Fix rsc so it can be recycled
Change-Id: I3cddf5d67c2e5dfb52380529f703a0d9558d8916

Former-commit-id: 78c1298085 [formerly 798463a4cf [formerly cd52bfbeb593a4b1891f4df7f7ae73c7193504d0]]
Former-commit-id: 798463a4cf
Former-commit-id: fbd4b64be8
2012-05-11 10:04:36 -05:00
Steve Harris
bcc12e03ed 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: 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]
Former-commit-id: 27bc369818
Former-commit-id: 572e1bb476
2012-05-09 13:14:00 -05:00
Steve Harris
c1bc408f84 12.5.1-2 baseline
Former-commit-id: b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: 84d191e7b6
Former-commit-id: ac708c050d
2012-05-03 19:17:13 -05:00
Steve Harris
7fa9dbd5fb 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -05:00
Steve Harris
931087306f 12.4.1-10 baseline
Former-commit-id: 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 704b75e1a1
Former-commit-id: 418489e726
2012-04-24 15:38:29 -05:00
Steve Harris
98c92073b5 12.4.1-7 baseline
Former-commit-id: cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]
Former-commit-id: 90ae4bbb36
Former-commit-id: 6d585942fe
2012-04-24 15:24:39 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Max Schenkelberg
65e7184cc4 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: 6812c1ba2b [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]
Former-commit-id: cbe92bdf32
Former-commit-id: a5fa19c914
2012-04-06 10:23:24 -05:00
Max Schenkelberg
e525c9c35d Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]
Former-commit-id: 54aaf05209
Former-commit-id: 48ca9ca105
2012-04-05 13:52:20 -05:00
Steve Harris
760ead2047 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
b05701d2d7 Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: 70357d90bc
Former-commit-id: 0665862abe
2012-03-29 10:03:05 -05:00
David Gillingham
364b9e19b3 Issue #354: Refactor AbstractParmManager to better handle ISC parm
pre-loading.

Former-commit-id: 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]
Former-commit-id: d68e3a7eea
Former-commit-id: 1908212c27
2012-03-05 11:23:11 -06:00
David Gillingham
87de9d067b Issue #346: Convert GFE to use identity-based ListenerLists, increase
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]
Former-commit-id: f6f0ca24df
Former-commit-id: bd01975367
2012-03-02 13:22:46 -06:00
Steve Harris
994e79cfb3 Merge branch 'ss_sync' into sync_test
Former-commit-id: 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]
Former-commit-id: 951ecfe3dd
Former-commit-id: 3b9c3e3474
2012-03-01 14:01:16 -06:00
David Gillingham
586f77e788 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor.
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

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

Former-commit-id: 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]
Former-commit-id: 32b2c06988
Former-commit-id: 5a8ba0f0fb
2012-02-23 13:23:59 -06:00
Steve Harris
0be3703c7e 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: 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: dcadf7baa4
Former-commit-id: 4981170462
2012-02-23 12:38:55 -06:00
Steve Harris
5a96582f16 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: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Steve Harris
829d2791e9 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
eda787edea 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: 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]
Former-commit-id: cabf9fd956
Former-commit-id: d971880b98
2012-02-20 13:03:39 -06:00
Steve Harris
cc45f5a268 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]
Former-commit-id: 6a064cb78b
Former-commit-id: a2fd2cf6fa
2012-02-20 12:54:25 -06:00
Steve Harris
d129eab241 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
2012-02-20 12:43:38 -06:00
Steve Harris
7b4b066a2b Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: 93f6535bd8
Former-commit-id: c209d6de36
2012-02-17 10:55:02 -06:00
Steve Harris
60b350f7f2 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: f693b6d0a7 [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]
Former-commit-id: 1002555dbd
Former-commit-id: 695e2979c3
2012-02-09 08:54:18 -06:00
Max Schenkelberg
83de7660b6 Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: e422b13ded [formerly 5f8d30bb43 [formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]
Former-commit-id: 5f8d30bb43
Former-commit-id: c410a4eb33
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
2c1110953c Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 9b78596436 [formerly 0617773c79 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]
Former-commit-id: 0617773c79
Former-commit-id: 138b4de82f
2012-01-31 10:53:10 -06:00
Matt Nash
ea6ef73802 Issue #26 add tear off code to git baseline
Former-commit-id: 4286cb0342 [formerly cf4e1f764e [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]
Former-commit-id: cf4e1f764e
Former-commit-id: 892cb9a7ae
2012-01-25 12:50:31 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00