Nate Jensen
8101a9fb70
Merge "Issue #2594 made heap status monitor default on launch" into development
...
Former-commit-id: e65c983653
[formerly 8d4d024617
] [formerly 542bbd88bc
] [formerly 09082cc89e
[formerly 542bbd88bc
[formerly 0907626a01c547a49d89d6cf15f479271dd0e0fe]]]
Former-commit-id: 09082cc89e
Former-commit-id: 42dd2d0efa21b3ab92b9121fca34f516371e73da [formerly 4d6bb9a75d
]
Former-commit-id: 86d6e78d17
2014-01-13 13:01:29 -06:00
Nate Jensen
70035635ec
Merge "Issue #2620 Reordered developer feature.xml to match p2-build.xml" into development
...
Former-commit-id: 10b6341adb
[formerly 02f7b23f72
] [formerly aba4acf355
] [formerly bd44fec4eb
[formerly aba4acf355
[formerly 2c9ce82cec838ac27153cfa1227b7bf787c1964b]]]
Former-commit-id: bd44fec4eb
Former-commit-id: 6ab8eb314426f4b3bc9fdde253d7d7e3cb7267d7 [formerly 708c77878f
]
Former-commit-id: 4b9411854e
2014-01-13 09:33:26 -06:00
Brian Clements
42e259b83c
Issue #2594 made heap status monitor default on launch
...
Former-commit-id: 3333d3b926
[formerly 4f37164fc5
] [formerly 6ba1eb0edb
] [formerly 4a62eb90dc
[formerly 6ba1eb0edb
[formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: 0c8dc064b7186b1457f6e9bd47835cc2ba812b79 [formerly 3d196a00dd
]
Former-commit-id: cde78c4006
2014-01-10 14:54:14 -06:00
Max Schenkelberg
6fa1f6cc12
Issue #2620 Reordered developer feature.xml to match p2-build.xml
...
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67
Former-commit-id: a3495d01dc
[formerly 13172879fd
] [formerly ae7eb39380
] [formerly 73c022da20
[formerly ae7eb39380
[formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]
Former-commit-id: 73c022da20
Former-commit-id: 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611
]
Former-commit-id: 59586b673b
2014-01-10 10:39:07 -06:00
Ben Steffensmeier
05ebc3eece
Issue #2647 Fix window focus problems.
...
Former-commit-id: eebab1d33f
[formerly 13da8899de
] [formerly 206754a3f8eac1e2ede760acafef51f7d6fa12a4 [formerly 2b9e9a41db
]] [formerly 488d5e45b1
[formerly 2b9e9a41db
[formerly 4b0053b20060ead87b34895ee7d03a4b6317c8fc]]]
Former-commit-id: 488d5e45b1
Former-commit-id: 7b56714a7309f567fe16d1c7a70ee9741297c5dc [formerly 0ada0c6d3f
]
Former-commit-id: 1aa018e5b7
2014-01-09 15:14:38 -06:00
Nate Jensen
7b17f4eabf
Merge "Issue #2563 added user server add/remove functionality" into development
...
Former-commit-id: c2a2a657bf
[formerly f7adb31fc5
] [formerly 7d0fc33055
] [formerly 6fdf4361f8
[formerly 7d0fc33055
[formerly f343c7bc294f4c89c4ac75630910f153e61d24a3]]]
Former-commit-id: 6fdf4361f8
Former-commit-id: 9b4895ed93f0a2ae2e0b94f8d502c98a45ed7a60 [formerly 0351c26443
]
Former-commit-id: aeffb73883
2014-01-09 13:44:24 -06:00
Brian Clements
9a28a4e067
Issue #2563 added user server add/remove functionality
...
now persists user entered servers to localization
Former-commit-id: 7279fbf6b3
[formerly af9292ea71
] [formerly 487aa58778
] [formerly c8cfc788f3
[formerly 487aa58778
[formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]
Former-commit-id: c8cfc788f3
Former-commit-id: a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69
]
Former-commit-id: a8f746f794
2014-01-09 13:19:59 -06:00
Max Schenkelberg
4085a38f94
Issue #2680 Fixed various OpenGL errors
...
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
Former-commit-id: 037cd48c62
[formerly 5d488d27b9
] [formerly 83c600ada9
] [formerly f4765d1577
[formerly 83c600ada9
[formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]]
Former-commit-id: f4765d1577
Former-commit-id: 078c53e38b0dfbb2d2f1efc3df9341d3b037960b [formerly e4de3defec
]
Former-commit-id: f10dcc6de3
2014-01-09 11:26:19 -06:00
Nate Jensen
02a60c86ff
Merge "Issue #2563 fixed room id creation" into development
...
Former-commit-id: 701efd5de9
[formerly 537dc6c8cc
] [formerly f1533b069a94fcd70602fe9d0d8551219afef11e [formerly cbad156c05
]] [formerly a8e9db0dde
[formerly cbad156c05
[formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 1b9b5174b8f31578073feb91a2f11b6ec67ff985 [formerly 5beb950218
]
Former-commit-id: 432a89c0fc
2014-01-07 13:50:41 -06:00
Brian Clements
e7602389b6
Issue #2563 fixed room id creation
...
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself
Former-commit-id: 40763433f0
[formerly a78b1d96af
] [formerly 82716fa147
] [formerly 66df912a4e
[formerly 82716fa147
[formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]
Former-commit-id: 66df912a4e
Former-commit-id: ce480f2f3d00e3ac778f4d35236875333682e387 [formerly 649483d3fd
]
Former-commit-id: 12c7371565
2014-01-07 13:04:24 -06:00
Nate Jensen
15c555bd0e
Merge "Issue #2563 fixed default xmpp port" into development
...
Former-commit-id: 2de703f6e8
[formerly 26f37a2fd4
] [formerly 92e1df8856
] [formerly 87876790f8
[formerly 92e1df8856
[formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]
Former-commit-id: 87876790f8
Former-commit-id: 7d4ac4c2b24db7918d4a19a0abd00db4ed4b6787 [formerly 365c11c9db
]
Former-commit-id: 527e0197be
2014-01-07 12:39:46 -06:00
Brian Clements
0193a9db0f
Issue #2563 fixed default xmpp port
...
The default port for postgres was there by mistake
Former-commit-id: ea63496cc3
[formerly e08c5ea04c
] [formerly e263cdb63a
] [formerly dfcf6e9ade
[formerly e263cdb63a
[formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6
]
Former-commit-id: 373feec7f5
2014-01-07 10:52:50 -06:00
Slav Korolev
679b61deea
Issue #2653 . Corrected decoding of SNOW monitor data.
...
Former-commit-id: 696728bafd
[formerly 5bbb774073
] [formerly 714fd018ef
] [formerly ab7fc816b4
[formerly 714fd018ef
[formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91
]
Former-commit-id: eb5ec35275
2014-01-07 11:48:13 -05:00
Nate Jensen
8cb9853117
Merge "Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins." into development
...
Former-commit-id: 49a892b402
[formerly 6969518530
] [formerly 6c5b954cf1
] [formerly 23b4da6615
[formerly 6c5b954cf1
[formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]
Former-commit-id: 23b4da6615
Former-commit-id: 0919175dd8e25d11fa16d9abfc144bbb47e10bf3 [formerly 72e77fc4b1
]
Former-commit-id: 1568132e22
2014-01-07 08:46:02 -06:00
Max Schenkelberg
257553461b
Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
...
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index
Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5
Former-commit-id: 30059d255c
[formerly b3aed99142
] [formerly 16046a4dde
] [formerly cc2080449c
[formerly 16046a4dde
[formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]
Former-commit-id: cc2080449c
Former-commit-id: d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460
]
Former-commit-id: 0ceaa43902
2014-01-06 17:03:45 -06:00
Brian Clements
bed3b77948
Issue #2563 modified server config parsing to allow for custom port
...
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.
Former-commit-id: 9102b08053
[formerly 4f2aa49807
] [formerly cea12a1a1d
] [formerly b01e6f0c98
[formerly cea12a1a1d
[formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]
Former-commit-id: b01e6f0c98
Former-commit-id: 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6
]
Former-commit-id: 74c6fdc613
2014-01-06 14:14:38 -06:00
Brian Clements
95c30dbe0f
Issue #2563 fixed label issue for non-grouped roster entry
...
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated
Former-commit-id: 0124fbd68d
[formerly 0ce560149e
] [formerly 73347283b6
] [formerly d07bc465d4
[formerly 73347283b6
[formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]
Former-commit-id: d07bc465d4
Former-commit-id: 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23
]
Former-commit-id: 5dcaa98110
2013-12-20 14:40:00 -06:00
Brian Clements
f084679410
Issue #2563 roster updates for stock servers
...
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group
Former-commit-id: b41eadd0be
[formerly b120d74099
] [formerly 2b8668a4eb
] [formerly e4bd8a3e2c
[formerly 2b8668a4eb
[formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c
]
Former-commit-id: 0882672686
2013-12-20 12:03:04 -06:00
Brian Clements
5dcd524fa1
Issue #2563 compatibility features for stock xmpp servers
...
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom
Former-commit-id: 24b3713680
[formerly 621a8536e6
] [formerly 09c0267237
] [formerly af83c0cf87
[formerly 09c0267237
[formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281
]
Former-commit-id: 917d8dffee
2013-12-20 10:41:13 -06:00
Nate Jensen
41bd7c47da
Merge "Issue #2562 moved session data from chat to packet extension" into development
...
Former-commit-id: ee5e00e6d6
[formerly ab5de71978
] [formerly 54a986613a
] [formerly 67ba8bb713
[formerly 54a986613a
[formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]
Former-commit-id: 67ba8bb713
Former-commit-id: f70ab4d6017a4ef18430da4722a242c647fc775f [formerly c61ac618ea
]
Former-commit-id: 2ceb8c2051
2013-12-19 12:41:32 -06:00
Brian Clements
64dda165db
Issue #2562 moved session data from chat to packet extension
...
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used
Former-commit-id: c2b759b38e
[formerly 2c20a87634
] [formerly 80650337ce
] [formerly ce0a34b53c
[formerly 80650337ce
[formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee
]
Former-commit-id: d58f8d7134
2013-12-19 12:08:21 -06:00
Steve Harris
0a47657ba3
Merge branch 'omaha_14.2.1' into development
...
Former-commit-id: 36b228cc7f
[formerly 8aac57e096
] [formerly 0950a8a1ba
] [formerly 64f8564cd8
[formerly 0950a8a1ba
[formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]
Former-commit-id: 64f8564cd8
Former-commit-id: d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d
]
Former-commit-id: 21aaafbd52
2013-12-18 13:14:27 -06:00
Richard Peter
73f12bf669
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: cc89b16338
[formerly e4f59ea119
] [formerly 1de516964b
] [formerly 2e7fd9ddba
[formerly 1de516964b
[formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744
]
Former-commit-id: 5c0cf804f1
2013-12-17 21:04:53 -06:00
Mike Duff
ca4bb45e94
Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
...
Former-commit-id: c5dbf9536d
[formerly e26bea423e
] [formerly 66f5585774
] [formerly 6406bcdd05
[formerly 66f5585774
[formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]
Former-commit-id: 6406bcdd05
Former-commit-id: dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03
]
Former-commit-id: 0232f16e7a
2013-12-17 09:41:30 -06:00
Bryan Kowal
a63bda59b4
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
...
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: b2550c873b
[formerly 0c3b22c8f2
] [formerly 43008f4698
] [formerly 120ebd045a
[formerly 43008f4698
[formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8
]
Former-commit-id: 68181d3f62
2013-12-16 16:39:10 -06:00
Lee Venable
df1150692d
Issue #2583 - Procedure dialog fixes and clean up.
...
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10
Former-commit-id: 197a8b5508
[formerly d6eb7534f5
] [formerly aa0e9121f8
] [formerly 7ee6053c22
[formerly aa0e9121f8
[formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e
]
Former-commit-id: d05d650430
2013-12-12 16:15:56 -06:00
Steve Harris
690b177ded
14.1.1-13 baseline
...
Former-commit-id: a2ae393ec1
[formerly 85eebac7e2
] [formerly c88b10039a
] [formerly b0b55a676b
[formerly c88b10039a
[formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979
]
Former-commit-id: 5368f23247
2013-12-12 16:59:57 -05:00
Jonathan Sanchez
bef733bb8f
Issue #2604 Refactored portions util out of viz.warngen.
...
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10
Former-commit-id: 966f814d2d
[formerly 9878c3a797
] [formerly 125e747fc9
] [formerly 2ecfe79516
[formerly 125e747fc9
[formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]
Former-commit-id: 2ecfe79516
Former-commit-id: 77df683bd7320416ea169ad18d4f073fee509742 [formerly 5796d108c3
]
Former-commit-id: 45903c0e7d
2013-12-11 14:59:16 -06:00
Ben Steffensmeier
f62b7011b7
Issue #2602 Switch around the order of some things on startup to make thinclient better.
...
Former-commit-id: c92b5842ab
[formerly bf508b4455
] [formerly a37db9d1b4
] [formerly 922674273e
[formerly a37db9d1b4
[formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc
]
Former-commit-id: 0fb85fe4aa
2013-12-11 12:45:11 -06:00
Slav Korolev
c1b72b0e10
Issue #2570 . Show All subscriptions in Subscription manager.
...
Former-commit-id: 51c0f8f92f
[formerly 85bc26b5a3
] [formerly b59e9499d2
] [formerly 67e18055cc
[formerly b59e9499d2
[formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 9efd61bf39542c3ae92ed81de94a71f51cb52f27 [formerly 6811b0e5c1
]
Former-commit-id: 746157755b
2013-12-11 08:57:13 -05:00
Nate Jensen
ee8d223346
Merge "Issue #2620 Fixed viz base feature dependency issues." into development
...
Former-commit-id: 3c728333b7
[formerly c4c61022b9
] [formerly 4c90d4c5f6
] [formerly cd58066889
[formerly 4c90d4c5f6
[formerly e41526263edecf1e867c27ccb89b6326f9675a85]]]
Former-commit-id: cd58066889
Former-commit-id: 823402ec5485e61576f944862a7a0a2a71242200 [formerly 8194559a6e
]
Former-commit-id: 9a03bf5943
2013-12-10 10:24:25 -06:00
Mike Duff
24ae26ef90
Issue #2601 - Fix NullPointerException.
...
Former-commit-id: 8b49b1dea7
[formerly 773e546f62
] [formerly 9e9706f55f
] [formerly d2fe42c27c
[formerly 9e9706f55f
[formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: d6664cc0a8ed267b96caf4d313f4f99d96961e7e [formerly 32b468023d
]
Former-commit-id: 02bbd4eaa6
2013-12-10 09:03:42 -06:00
Max Schenkelberg
774859fcb9
Issue #2620 Fixed viz base feature dependency issues.
...
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec
Former-commit-id: 0084b5b4f1
[formerly be45102814
] [formerly 9d846aa104
] [formerly 987d4b3a30
[formerly 9d846aa104
[formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e
]
Former-commit-id: e86e477165
2013-12-09 15:14:01 -06:00
Lee Venable
b342346474
Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
...
Former-commit-id: 77f637dff1
[formerly 997c575919
] [formerly 249435f17c
] [formerly 2c6b4309f0
[formerly 249435f17c
[formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 3186e75460a5b4acb8c484648f1f445e432dee15 [formerly cc7885610d
]
Former-commit-id: 4850830125
2013-12-09 09:51:41 -06:00
Brian Clements
4d04f6edbf
Issue #2561 removed ECF from collaboration
...
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list
Former-commit-id: d0d14ec091
[formerly 5d1d44b60d
] [formerly 8ece30944a
] [formerly e6c4b39aca
[formerly 8ece30944a
[formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202
]
Former-commit-id: 5a7fca6352
2013-12-06 17:07:16 -06:00
Mike Duff
5299287b65
Issue #2271 - Fix menu problem with previously selected points being selectable again
...
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee
Former-commit-id: e91227bad4
[formerly 850e4dfbde
] [formerly 0a5f2e3484
] [formerly ebc730ac2d
[formerly 0a5f2e3484
[formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 10eeac71861238a8de2287ad168fcc62e2afd598 [formerly 4d210517bd
]
Former-commit-id: 1925177772
2013-12-06 12:58:38 -06:00
Nate Jensen
71bc390b4f
Issue #2599 fix constructor
...
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e
Former-commit-id: 899bc199bb
[formerly ec6b5393ef
] [formerly 9bff38e0d3
] [formerly 41014a105d
[formerly 9bff38e0d3
[formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: 8c75e2081d678b06e6390ca47fa30f36b8fcd47a [formerly f3e455d1a3
]
Former-commit-id: e8f28c6799
2013-12-06 12:35:22 -06:00
Ben Steffensmeier
57de1adb55
Issue #2537 Fix feature for poitndata dependency on dataaccess.
...
Former-commit-id: 258988c269
[formerly 067c510315
] [formerly 59c6a24b68
] [formerly d883f8dbb1
[formerly 59c6a24b68
[formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2
]
Former-commit-id: 899cb2628c
2013-12-06 09:14:01 -06:00
Richard Peter
3088533103
Merge "Issue #2545 - Get bandwidth graph data by network" into development
...
Former-commit-id: da82396995
[formerly df4a4c5121
] [formerly d0b50eee3c
] [formerly 6fde307f0a
[formerly d0b50eee3c
[formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051
]
Former-commit-id: 45889cb80f
2013-12-05 14:54:46 -06:00
Mike Duff
802e0d360c
Issue #2545 - Get bandwidth graph data by network
...
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314
Former-commit-id: c7345582e9
[formerly a412a19583
] [formerly 4796f43495
] [formerly 0c452e2434
[formerly 4796f43495
[formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360
]
Former-commit-id: 45cf9384d8
2013-12-05 13:35:31 -06:00
Nate Jensen
ad2b7df40b
Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
...
Former-commit-id: 65e20edacf
[formerly b16c88133b
] [formerly c47f6546dd
] [formerly ae0bd2a86f
[formerly c47f6546dd
[formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35
]
Former-commit-id: 15fee953f5
2013-12-05 12:59:58 -06:00
Richard Peter
530b3bd588
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: ba577ff354
[formerly b3b23647b4
] [formerly 0c4ae068ad
] [formerly a0b6ea8bb2
[formerly 0c4ae068ad
[formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4
]
Former-commit-id: 60679a818a
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
6ebc4e5fbc
Issue #2537 Use PointDataAccessFactory for multiple point data types.
...
Change-Id: I655091f116cde662933ed96d926372a14a435dfc
Former-commit-id: 318e48c945
[formerly 7c2a4ef72c
] [formerly 9df4f83a0cf5042c67bf0eccc5635e37d1e149a8 [formerly f682e66e9b
]] [formerly 46a466497c
[formerly f682e66e9b
[formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d
]
Former-commit-id: fde968a834
2013-12-05 10:54:28 -06:00
Lee Venable
0a9dcb2cc4
Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
...
Former-commit-id: 93a5c3f746
[formerly 67accdb7e3
] [formerly 4f1b663b37
] [formerly b7be687903
[formerly 4f1b663b37
[formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec
]
Former-commit-id: 40dc07e0ff
2013-12-05 08:30:28 -06:00
Lee Venable
35352350b7
Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
...
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b
Former-commit-id: d420f11832
[formerly 9c64148733
] [formerly 266d4884da
] [formerly a385ec612c
[formerly 266d4884da
[formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]
Former-commit-id: a385ec612c
Former-commit-id: a8a45bbbf444fd2b11c872dd17abd893d3419ecd [formerly d433717c8c
]
Former-commit-id: cddca699c6
2013-12-05 08:25:46 -06:00
Ron Anderson
fb3b7b0a9f
Issue #2331 Fixed Topo retrieval for smartTools/procedures
...
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: 218a052bbf
[formerly 497236ca74
] [formerly b5906249cc
] [formerly 20eeb2796e
[formerly b5906249cc
[formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f
]
Former-commit-id: e30d6041ee
2013-12-04 17:10:48 -06:00
Steve Harris
1e4b2bac7b
14.1.1-12 baseline
...
Former-commit-id: f53eb87892
[formerly 371d1ca63c
] [formerly b24d9c80b0
] [formerly a3ec45a99f
[formerly b24d9c80b0
[formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af
]
Former-commit-id: 4e6f319422
2013-12-04 16:47:59 -05:00
Ron Anderson
21f431f203
Issue #2490 Fixed error handling in HazardsTable.py
...
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2
Former-commit-id: 22b56c725c
[formerly 54219aa03d
] [formerly 7459d65134
] [formerly c9cb2bdb6a
[formerly 7459d65134
[formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29
]
Former-commit-id: a99197c5c2
2013-12-04 15:29:28 -06:00
Nate Jensen
3c8d882681
Merge "Issue #2600 Fix typo in DataStoreCache." into development
...
Former-commit-id: 5294fbe981
[formerly 286539f323
] [formerly 020c4de47d
] [formerly 0ead2a03ea
[formerly 020c4de47d
[formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9
]
Former-commit-id: 331df460ff
2013-12-04 11:54:11 -06:00
Dave Hladky
085b6124b9
Issue #2607 Fixed Nullpointer
...
Former-commit-id: 2184ded94c
[formerly 4b81f76ce3
] [formerly 25ce37d2d8
] [formerly 25f745bc12
[formerly 25ce37d2d8
[formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613
]
Former-commit-id: c93d7b57a1
2013-12-04 11:36:23 -06:00