annotate Comments.lua @ 264:58b090074eda

Allow moving the comment frame via the WoWDB logo, and disallow clicking through the frame to the 3D world.
author James D. Callahan III <jcallahan@curse.com>
date Tue, 19 Mar 2013 23:53:38 -0500
parents 03f1fbe64104
children 726e8a94391d
rev   line source
jcallahan@249 1 -- LUA API ------------------------------------------------------------
jcallahan@249 2
jcallahan@249 3 local _G = getfenv(0)
jcallahan@249 4
jcallahan@249 5 local table = _G.table
jcallahan@249 6
jcallahan@249 7 -- ADDON NAMESPACE ----------------------------------------------------
jcallahan@249 8
jcallahan@249 9 local ADDON_NAME, private = ...
jcallahan@249 10
jcallahan@249 11 local LibStub = _G.LibStub
jcallahan@249 12 local WDP = LibStub("AceAddon-3.0"):GetAddon(ADDON_NAME)
jcallahan@259 13 local Dialog = LibStub("LibDialog-1.0")
jcallahan@249 14
jcallahan@249 15 local ParseGUID = private.ParseGUID
jcallahan@260 16 local ItemLinkToID = private.ItemLinkToID
jcallahan@263 17 local DBEntry = private.DBEntry
jcallahan@249 18
jcallahan@258 19 -- CONSTANTS ----------------------------------------------------------
jcallahan@258 20
jcallahan@258 21 local EDIT_MAXCHARS = 3000
jcallahan@259 22 local EDIT_DESCRIPTION_FORMAT = "Enter your comment below, being as descriptive as possible. Comments are limited to %s characters, including newlines and spaces."
jcallahan@259 23 local LINK_COMMENT_TOOLTIP = "Click here to create a link to the comment page on WoWDB."
jcallahan@261 24 local LINK_EDITBOX_DESC_FORMAT = "Copy the highlighted text and paste it into your browser to visit the comments for |cffffd200%s|r."
jcallahan@259 25
jcallahan@259 26 local URL_BASE = "http://www.wowdb.com/"
jcallahan@259 27
jcallahan@259 28 local URL_TYPE_MAP = {
jcallahan@259 29 ITEM = "items",
jcallahan@259 30 OBJECT = "objects",
jcallahan@259 31 NPC = "npcs",
jcallahan@261 32 QUEST = "quests",
jcallahan@260 33 SPELL = "spells",
jcallahan@259 34 VEHICLE = "npcs",
jcallahan@259 35 }
jcallahan@259 36
jcallahan@259 37 Dialog:Register("WDP_CommentLink", {
jcallahan@259 38 text = "",
jcallahan@259 39 editboxes = {
jcallahan@259 40 {
jcallahan@259 41 text = _G.UNKNOWN,
jcallahan@259 42 on_escape_pressed = function(self)
jcallahan@259 43 self:ClearFocus()
jcallahan@259 44 end,
jcallahan@259 45 },
jcallahan@259 46 },
jcallahan@259 47 buttons = {
jcallahan@259 48 {
jcallahan@259 49 text = _G.OKAY,
jcallahan@259 50 }
jcallahan@259 51 },
jcallahan@259 52 show_while_dead = true,
jcallahan@259 53 hide_on_escape = true,
jcallahan@259 54 is_exclusive = true,
jcallahan@259 55 on_show = function(self, data)
jcallahan@259 56 local editbox = self.editboxes[1]
jcallahan@259 57 editbox:SetWidth(self:GetWidth() - 20)
jcallahan@259 58 editbox:SetText(("%s%s/%d#related:comments"):format(URL_BASE, URL_TYPE_MAP[data.type_name], data.id))
jcallahan@259 59 editbox:HighlightText()
jcallahan@259 60 editbox:SetFocus()
jcallahan@259 61
jcallahan@261 62 self.text:SetJustifyH("LEFT")
jcallahan@259 63 self.text:SetFormattedText(LINK_EDITBOX_DESC_FORMAT:format(data.label))
jcallahan@259 64 end,
jcallahan@259 65 })
jcallahan@259 66
jcallahan@259 67 local comment_subject = {}
jcallahan@258 68
jcallahan@249 69 -- HELPERS ------------------------------------------------------------
jcallahan@249 70
jcallahan@249 71 local comment_frame
jcallahan@249 72 do
jcallahan@249 73 local panel = _G.CreateFrame("Frame", "WDP_CommentFrame", _G.UIParent, "TranslucentFrameTemplate")
jcallahan@258 74 panel:SetSize(480, 350)
jcallahan@249 75 panel:SetPoint("CENTER", _G.UIParent, "CENTER")
jcallahan@249 76 panel:SetFrameStrata("DIALOG")
jcallahan@249 77 panel.Bg:SetTexture([[Interface\FrameGeneral\UI-Background-Rock]], true, true)
jcallahan@249 78 panel.Bg:SetHorizTile(true)
jcallahan@249 79 panel.Bg:SetVertTile(true)
jcallahan@264 80 panel:EnableMouse(true)
jcallahan@264 81 panel:SetMovable(true)
jcallahan@249 82 panel:Hide()
jcallahan@249 83 comment_frame = panel
jcallahan@249 84
jcallahan@249 85 table.insert(_G.UISpecialFrames, panel:GetName())
jcallahan@249 86
jcallahan@249 87 local streaks = panel:CreateTexture("$parentTopTileStreaks", "BORDER", "_UI-Frame-TopTileStreaks", -6)
jcallahan@249 88 streaks:SetPoint("TOPLEFT", 13, -13)
jcallahan@249 89 streaks:SetPoint("BOTTOMRIGHT", panel, "TOPRIGHT", -13, -35)
jcallahan@249 90
jcallahan@249 91 local header = _G.CreateFrame("Frame", "$parentHeader", panel, "TranslucentFrameTemplate")
jcallahan@249 92 header:SetSize(128, 64)
jcallahan@249 93 header:SetPoint("CENTER", panel, "TOP", 0, -8)
jcallahan@249 94 header.Bg:SetTexture([[Interface\FrameGeneral\UI-Background-Marble]])
jcallahan@249 95 header.Bg:SetHorizTile(true)
jcallahan@249 96 header.Bg:SetVertTile(true)
jcallahan@264 97 header:SetMovable(true)
jcallahan@264 98
jcallahan@264 99 header:SetScript("OnMouseDown", function()
jcallahan@264 100 panel:StartMoving()
jcallahan@264 101 end)
jcallahan@264 102
jcallahan@264 103 header:SetScript("OnMouseUp", function()
jcallahan@264 104 panel:StopMovingOrSizing()
jcallahan@264 105 end)
jcallahan@264 106
jcallahan@249 107 panel.header = header
jcallahan@249 108
jcallahan@249 109 local logo = header:CreateTexture(nil, "ARTWORK")
jcallahan@249 110 logo:SetTexture([[Interface\AddOns\WoWDBProfiler\wowdb-logo]])
jcallahan@249 111 logo:SetPoint("TOPLEFT", header, 10, -10)
jcallahan@249 112 logo:SetPoint("BOTTOMRIGHT", header, -10, 10)
jcallahan@249 113
jcallahan@258 114 local subject_name = panel:CreateFontString(nil, "ARTWORK", "GameFontNormal")
jcallahan@258 115 subject_name:SetPoint("TOP", header, "BOTTOM", 0, -10)
jcallahan@258 116 panel.subject_name = subject_name
jcallahan@258 117
jcallahan@258 118 local subject_data = panel:CreateFontString(nil, "ARTWORK", "GameFontNormal")
jcallahan@258 119 subject_data:SetPoint("TOP", subject_name, "BOTTOM", 0, -3)
jcallahan@258 120 panel.subject_data = subject_data
jcallahan@249 121
jcallahan@249 122 local close = _G.CreateFrame("Button", nil, panel, "UIPanelCloseButton")
jcallahan@249 123 close:SetPoint("TOPRIGHT", panel, "TOPRIGHT", -7, -7)
jcallahan@249 124
jcallahan@249 125 local scroll_frame = _G.CreateFrame("ScrollFrame", "$parentScrollFrame", panel)
jcallahan@249 126 scroll_frame:SetSize(435, 150)
jcallahan@249 127 scroll_frame:SetPoint("BOTTOM", 0, 70)
jcallahan@249 128
jcallahan@249 129 scroll_frame:SetScript("OnScrollRangeChanged", function(self, x, y)
jcallahan@249 130 _G.ScrollFrame_OnScrollRangeChanged(self, x, y)
jcallahan@249 131 end)
jcallahan@249 132
jcallahan@249 133 scroll_frame:SetScript("OnVerticalScroll", function(self, offset)
jcallahan@249 134 local scrollbar = self.ScrollBar
jcallahan@249 135 scrollbar:SetValue(offset)
jcallahan@249 136
jcallahan@249 137 local min, max = scrollbar:GetMinMaxValues()
jcallahan@249 138
jcallahan@249 139 if offset == 0 then
jcallahan@249 140 scrollbar.ScrollUpButton:Disable()
jcallahan@249 141 else
jcallahan@249 142 scrollbar.ScrollUpButton:Enable()
jcallahan@249 143 end
jcallahan@249 144
jcallahan@249 145 if (scrollbar:GetValue() - max) == 0 then
jcallahan@249 146 scrollbar.ScrollDownButton:Disable()
jcallahan@249 147 else
jcallahan@249 148 scrollbar.ScrollDownButton:Enable()
jcallahan@249 149 end
jcallahan@249 150 end)
jcallahan@249 151
jcallahan@249 152 scroll_frame:SetScript("OnMouseWheel", function(self, delta)
jcallahan@249 153 _G.ScrollFrameTemplate_OnMouseWheel(self, delta)
jcallahan@249 154 end)
jcallahan@249 155
jcallahan@258 156 panel.scroll_frame = scroll_frame
jcallahan@258 157
jcallahan@249 158 local edit_container = _G.CreateFrame("Frame", nil, scroll_frame)
jcallahan@249 159 edit_container:SetPoint("TOPLEFT", scroll_frame, -7, 7)
jcallahan@249 160 edit_container:SetPoint("BOTTOMRIGHT", scroll_frame, 7, -7)
jcallahan@249 161 edit_container:SetFrameLevel(scroll_frame:GetFrameLevel() - 1)
jcallahan@249 162 edit_container:SetBackdrop({
jcallahan@249 163 bgFile = [[Interface\Tooltips\UI-Tooltip-Background]],
jcallahan@249 164 edgeFile = [[Interface\Tooltips\UI-Tooltip-Border]],
jcallahan@249 165 tile = true,
jcallahan@249 166 tileSize = 16,
jcallahan@249 167 edgeSize = 16,
jcallahan@249 168 insets = {
jcallahan@249 169 left = 5,
jcallahan@249 170 right = 5,
jcallahan@249 171 top = 5,
jcallahan@249 172 bottom = 5
jcallahan@249 173 }
jcallahan@249 174 })
jcallahan@249 175
jcallahan@249 176 edit_container:SetBackdropBorderColor(_G.TOOLTIP_DEFAULT_COLOR.r, _G.TOOLTIP_DEFAULT_COLOR.g, _G.TOOLTIP_DEFAULT_COLOR.b)
jcallahan@249 177 edit_container:SetBackdropColor(0, 0, 0)
jcallahan@249 178
jcallahan@259 179 local link_button = _G.CreateFrame("Button", "$parentLinkButton", panel)
jcallahan@259 180 link_button:SetSize(32, 16)
jcallahan@259 181 link_button:SetPoint("TOPRIGHT", edit_container, "BOTTOMRIGHT", 5, 0)
jcallahan@259 182
jcallahan@259 183 link_button:SetNormalTexture([[Interface\TradeSkillFrame\UI-TradeSkill-LinkButton]])
jcallahan@259 184 link_button:GetNormalTexture():SetTexCoord(0, 1, 0, 0.5)
jcallahan@259 185
jcallahan@259 186 link_button:SetHighlightTexture([[Interface\TradeSkillFrame\UI-TradeSkill-LinkButton]])
jcallahan@259 187 link_button:GetHighlightTexture():SetTexCoord(0, 1, 0.5, 1)
jcallahan@259 188
jcallahan@259 189 link_button:SetScript("OnClick", function(self)
jcallahan@259 190 Dialog:Spawn("WDP_CommentLink", { type_name = comment_subject.type_name, id = comment_subject.id, label = comment_subject.label })
jcallahan@259 191 end)
jcallahan@259 192
jcallahan@259 193 link_button:SetScript("OnEnter", function(self)
jcallahan@259 194 _G.GameTooltip:SetOwner(self, "ANCHOR_TOPLEFT")
jcallahan@259 195 _G.GameTooltip:SetText(LINK_COMMENT_TOOLTIP, nil, nil, nil, nil, 1)
jcallahan@259 196 _G.GameTooltip:Show()
jcallahan@259 197 end)
jcallahan@259 198
jcallahan@259 199 link_button:SetScript("OnLeave", _G.GameTooltip_Hide)
jcallahan@259 200
jcallahan@258 201 local edit_description = edit_container:CreateFontString("MUFASA", "ARTWORK", "GameFontHighlight")
jcallahan@258 202 edit_description:SetHeight(36)
jcallahan@258 203 edit_description:SetPoint("BOTTOMLEFT", edit_container, "TOPLEFT", 5, 3)
jcallahan@258 204 edit_description:SetPoint("BOTTOMRIGHT", edit_container, "TOPRIGHT", 5, 3)
jcallahan@258 205 edit_description:SetFormattedText(EDIT_DESCRIPTION_FORMAT, _G.BreakUpLargeNumbers(EDIT_MAXCHARS))
jcallahan@258 206 edit_description:SetWordWrap(true)
jcallahan@258 207 edit_description:SetJustifyH("LEFT")
jcallahan@258 208
jcallahan@249 209 local edit_box = _G.CreateFrame("EditBox", nil, scroll_frame)
jcallahan@249 210 edit_box:SetMultiLine(true)
jcallahan@258 211 edit_box:SetMaxLetters(EDIT_MAXCHARS)
jcallahan@249 212 edit_box:EnableMouse(true)
jcallahan@249 213 edit_box:SetAutoFocus(false)
jcallahan@249 214 edit_box:SetFontObject("ChatFontNormal")
jcallahan@249 215 edit_box:SetSize(420, 220)
jcallahan@249 216 edit_box:HighlightText(0)
jcallahan@258 217 edit_box:SetFrameLevel(scroll_frame:GetFrameLevel() - 1)
jcallahan@249 218
jcallahan@249 219 edit_box:SetScript("OnCursorChanged", _G.ScrollingEdit_OnCursorChanged)
jcallahan@249 220 edit_box:SetScript("OnEscapePressed", _G.EditBox_ClearFocus)
jcallahan@249 221 edit_box:SetScript("OnShow", function(self)
jcallahan@249 222 _G.EditBox_SetFocus(self)
jcallahan@249 223
jcallahan@249 224 if self:GetNumLetters() > 0 then
jcallahan@249 225 panel.submitButton:Enable()
jcallahan@249 226 else
jcallahan@249 227 panel.submitButton:Disable()
jcallahan@249 228 end
jcallahan@249 229 end)
jcallahan@249 230
jcallahan@249 231 edit_box:SetScript("OnTextChanged", function(self, user_input)
jcallahan@249 232 local parent = self:GetParent()
jcallahan@249 233 local num_letters = self:GetNumLetters()
jcallahan@249 234 _G.ScrollingEdit_OnTextChanged(self, parent)
jcallahan@258 235 parent.charCount:SetFormattedText(_G.BreakUpLargeNumbers(self:GetMaxLetters() - num_letters))
jcallahan@249 236
jcallahan@249 237 if num_letters > 0 then
jcallahan@249 238 panel.submitButton:Enable();
jcallahan@258 239 else
jcallahan@258 240 panel.submitButton:Disable()
jcallahan@249 241 end
jcallahan@249 242 end)
jcallahan@249 243
jcallahan@249 244 edit_box:SetScript("OnUpdate", function(self, elapsed)
jcallahan@249 245 _G.ScrollingEdit_OnUpdate(self, elapsed, self:GetParent())
jcallahan@249 246 end)
jcallahan@249 247
jcallahan@258 248 edit_container:SetScript("OnMouseUp", function()
jcallahan@258 249 _G.EditBox_SetFocus(edit_box)
jcallahan@258 250 end)
jcallahan@258 251
jcallahan@258 252 scroll_frame.edit_box = edit_box
jcallahan@249 253 scroll_frame:SetScrollChild(edit_box)
jcallahan@249 254
jcallahan@249 255 local char_count = scroll_frame:CreateFontString(nil, "OVERLAY", "GameFontDisableLarge")
jcallahan@249 256 char_count:SetPoint("BOTTOMRIGHT", -15, 0)
jcallahan@249 257 scroll_frame.charCount = char_count
jcallahan@249 258
jcallahan@249 259 local scroll_bar = _G.CreateFrame("Slider", "$parentScrollBar", scroll_frame, "UIPanelScrollBarTemplate")
jcallahan@249 260 scroll_bar:SetPoint("TOPLEFT", scroll_frame, "TOPRIGHT", -13, -16)
jcallahan@249 261 scroll_bar:SetPoint("BOTTOMLEFT", scroll_frame, "BOTTOMRIGHT", -13, 16)
jcallahan@249 262 scroll_frame.ScrollBar = scroll_bar
jcallahan@249 263
jcallahan@249 264 _G.ScrollFrame_OnLoad(scroll_frame)
jcallahan@249 265
jcallahan@249 266 local submit = _G.CreateFrame("Button", "$parentSubmit", panel, "GameMenuButtonTemplate")
jcallahan@249 267 submit:SetSize(160, 30)
jcallahan@249 268 submit:SetPoint("BOTTOM", 0, 15)
jcallahan@249 269 submit:SetText(_G.SUBMIT)
jcallahan@249 270 submit:Enable(false)
jcallahan@249 271
jcallahan@249 272 submit:SetScript("OnClick", function()
jcallahan@263 273 local entry = DBEntry(URL_TYPE_MAP[comment_subject.type_name], comment_subject.id)
jcallahan@263 274
jcallahan@263 275 if not entry then
jcallahan@263 276 WDP:Print("An error has occurred; please report at http://wow.curseforge.com/addons/wowdb-profiler/create-ticket/")
jcallahan@263 277 return
jcallahan@263 278 end
jcallahan@263 279 entry.comments = entry.comments or {}
jcallahan@263 280 entry.comments[#entry.comments + 1] = edit_box:GetText()
jcallahan@263 281
jcallahan@249 282 edit_box:SetText("")
jcallahan@249 283 _G.HideUIPanel(panel)
jcallahan@249 284 end)
jcallahan@249 285 panel.submitButton = submit
jcallahan@249 286 end
jcallahan@249 287
jcallahan@260 288 local function CreateUnitComment(unit_id)
jcallahan@260 289 if not _G.UnitExists(unit_id) then
jcallahan@260 290 WDP:Printf("Unit '%s' does not exist.", unit_id)
jcallahan@260 291 return
jcallahan@260 292 end
jcallahan@260 293 local unit_type, unit_idnum = ParseGUID(_G.UnitGUID(unit_id))
jcallahan@260 294
jcallahan@260 295 if not unit_idnum then
jcallahan@260 296 WDP:Printf("Unable to determine unit from '%s'", unit_id)
jcallahan@260 297 return
jcallahan@260 298 end
jcallahan@259 299 local type_name = private.UNIT_TYPE_NAMES[unit_type + 1]
jcallahan@259 300 local unit_name = _G.UnitName(unit_id)
jcallahan@259 301 comment_subject.type_name = type_name
jcallahan@259 302 comment_subject.id = unit_idnum
jcallahan@259 303 comment_subject.label = unit_name
jcallahan@259 304
jcallahan@259 305 comment_frame.subject_name:SetText(unit_name)
jcallahan@259 306 comment_frame.subject_data:SetFormattedText("(%s #%d)", type_name, unit_idnum)
jcallahan@258 307 comment_frame.scroll_frame.edit_box:SetText("")
jcallahan@262 308 _G.ShowUIPanel(comment_frame)
jcallahan@249 309 end
jcallahan@249 310
jcallahan@260 311 local DATA_TYPE_MAPPING = {
jcallahan@260 312 merchant = "ITEM",
jcallahan@260 313 }
jcallahan@260 314
jcallahan@260 315 local CURSOR_DATA_FUNCS = {
jcallahan@260 316 item = function(data_type, data, data_subtype)
jcallahan@260 317 local item_name = _G.GetItemInfo(data)
jcallahan@260 318 comment_subject.type_name = data_type
jcallahan@260 319 comment_subject.id = data
jcallahan@260 320 comment_subject.label = item_name
jcallahan@260 321
jcallahan@260 322 comment_frame.subject_name:SetText(item_name)
jcallahan@260 323 comment_frame.subject_data:SetFormattedText("(%s #%d)", data_type, data)
jcallahan@260 324 end,
jcallahan@260 325 merchant = function(data_type, data)
jcallahan@260 326 local item_link = _G.GetMerchantItemLink(data)
jcallahan@260 327 local item_name = _G.GetItemInfo(item_link)
jcallahan@260 328 local item_id = ItemLinkToID(item_link)
jcallahan@260 329 comment_subject.type_name = data_type
jcallahan@260 330 comment_subject.id = item_id
jcallahan@260 331 comment_subject.label = item_name
jcallahan@260 332
jcallahan@260 333 comment_frame.subject_name:SetText(item_name)
jcallahan@260 334 comment_frame.subject_data:SetFormattedText("(%s #%d)", data_type, item_id)
jcallahan@260 335 end,
jcallahan@260 336 spell = function(data_type, data, data_subtype, subdata)
jcallahan@260 337 local spell_name = _G.GetSpellInfo(subdata)
jcallahan@260 338 comment_subject.type_name = data_type
jcallahan@260 339 comment_subject.id = subdata
jcallahan@260 340 comment_subject.label = spell_name
jcallahan@260 341
jcallahan@260 342 comment_frame.subject_name:SetText(spell_name)
jcallahan@260 343 comment_frame.subject_data:SetFormattedText("(%s #%d)", data_type, subdata)
jcallahan@260 344 end,
jcallahan@260 345 }
jcallahan@260 346
jcallahan@249 347 local function CreateCursorComment()
jcallahan@260 348 local data_type, data, data_subtype, subdata = _G.GetCursorInfo()
jcallahan@260 349
jcallahan@260 350 if not CURSOR_DATA_FUNCS[data_type] then
jcallahan@260 351 WDP:Print("Unable to determine comment subject from cursor.")
jcallahan@260 352 return
jcallahan@260 353 end
jcallahan@260 354 CURSOR_DATA_FUNCS[data_type](DATA_TYPE_MAPPING[data_type] or data_type:upper(), data, data_subtype, subdata)
jcallahan@260 355 comment_frame.scroll_frame.edit_box:SetText("")
jcallahan@262 356 _G.ShowUIPanel(comment_frame)
jcallahan@249 357 end
jcallahan@249 358
jcallahan@261 359 local function CreateQuestComment()
jcallahan@261 360 local index = _G.GetQuestLogSelection()
jcallahan@261 361
jcallahan@261 362 if not index or not _G.QuestLogFrame:IsShown() then
jcallahan@261 363 WDP:Print("You must select a quest from the Quest frame.")
jcallahan@261 364 return
jcallahan@261 365 end
jcallahan@261 366 local title, _, tag, _, is_header, _, _, _, idnum = _G.GetQuestLogTitle(index)
jcallahan@261 367
jcallahan@261 368 if is_header then
jcallahan@261 369 WDP:Print("You must select a quest from the Quest frame.")
jcallahan@261 370 return
jcallahan@261 371 end
jcallahan@261 372 comment_subject.type_name = "QUEST"
jcallahan@261 373 comment_subject.id = idnum
jcallahan@261 374 comment_subject.label = title
jcallahan@261 375
jcallahan@261 376 comment_frame.subject_name:SetText(title)
jcallahan@261 377 comment_frame.subject_data:SetFormattedText("(%s #%d)", "QUEST", idnum)
jcallahan@261 378 comment_frame.scroll_frame.edit_box:SetText("")
jcallahan@262 379 _G.ShowUIPanel(comment_frame)
jcallahan@261 380 end
jcallahan@261 381
jcallahan@249 382 -- METHODS ------------------------------------------------------------
jcallahan@249 383
jcallahan@249 384 function private.ProcessCommentCommand(arg)
jcallahan@249 385 if not arg or arg == "" then
jcallahan@249 386 WDP:Print("You must supply a valid comment type.")
jcallahan@249 387 return
jcallahan@249 388 end
jcallahan@249 389
jcallahan@249 390 if arg == "cursor" then
jcallahan@260 391 CreateCursorComment()
jcallahan@249 392 return
jcallahan@261 393 elseif arg == "quest" then
jcallahan@261 394 CreateQuestComment()
jcallahan@261 395 return
jcallahan@249 396 end
jcallahan@260 397 CreateUnitComment(arg)
jcallahan@249 398 end